diff --git a/wix/nzbdrone.wxs b/wix/nzbdrone.wxs
new file mode 100644
index 000000000..fed16ce94
--- /dev/null
+++ b/wix/nzbdrone.wxs
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Product Id="*" Name="NzbDrone" Language="1033" Version="$(env.BUILD_NUMBER)" Manufacturer="NzbDrone" UpgradeCode="56833D74-A480-4CA2-B562-5A018B3A0F99">
+        <Package Description="NzbDrone" InstallerVersion="200" Compressed="yes" InstallPrivileges="elevated" InstallScope="perMachine" Platform="x86" Manufacturer="NzbDrone" />
+        <Media Id="1" Cabinet="nzbdrone.cab" EmbedCab="yes" CompressionLevel="high" />
+        <Property Id="ARPPRODUCTICON" Value="SX_ICON" />
+        <Directory Id="TARGETDIR" Name="SourceDir">
+            <Directory Id="LocalAppDataFolder" Name="AppDataFolder">
+                <Directory Name="SyntikX" Id="SX_ROOT">
+                    <Component Id="SX_APP_COMP" DiskId="1" Guid="9c3ac309-cde4-4338-be75-a914cbce2601">
+                        <File Id="CONSOLE_EXE_FILE" Name="NzbDrone.Console.exe" Source="..\_output\NzbDrone.Console.exe" />
+                        <RegistryValue Root="HKCU" Key="Software\Microsoft\SyntikX" Name="installed" Type="integer" Value="1" KeyPath="yes" />
+                        <RemoveFolder Id="SX_ROOT" On="uninstall" />
+                    </Component>
+                </Directory>
+            </Directory>
+            <!--
+      <Directory Id="DesktopFolder">
+        <Component Id="SX_DESKTOP_SHORTCUT_COMP" Guid="1f395635-7a9d-454d-aab4-95a5a4e70be4">
+          <Shortcut Id="SX_DESKTOP_SHORTCUT" Name="SyntikX" Description="SyntikX Backup Client" Target="[SX_ROOT]SyntikX.Client.exe" WorkingDirectory="SX_ROOT" />
+          <RegistryValue Root="HKCU" Key="Software\Microsoft\SyntikX" Name="installed" Type="integer" Value="1" KeyPath="yes" />
+        </Component>
+      </Directory>
+       <Directory Id="ProgramMenuFolder">
+        <Directory Id="SX_START_DIR" Name="SyntikX">
+          <Component Id="SX_START_SHORTCUT_COMP" Guid="8b3d54c6-712b-4bc2-b1e9-7cf40bcc1344">
+            <Shortcut Id="SX_START_SHORTCUT" Name="SyntikX" Description="SyntikX Backup Client" Target="[SX_ROOT]SyntikX.Client.exe" WorkingDirectory="SX_ROOT" />
+            <RemoveFolder Id="SX_START_DIR" On="uninstall" />
+            <RegistryValue Root="HKCU" Key="Software\Microsoft\SyntikX" Name="installed" Type="integer" Value="1" KeyPath="yes" />
+          </Component>
+        </Directory>
+        <Directory Id="StartupFolder" Name="Startup">
+          <Component Id="SX_STARTUP_SHORTCUT_COMP" Guid="0fdfe510-621e-4925-a0d4-395617fb7cbc">
+            <Shortcut Id="SX_STARTUP_SHORTCUT" Name="SyntikX" Description="SyntikX Backup Client" Target="[SX_ROOT]SyntikX.Client.exe" Arguments="/startup" WorkingDirectory="SX_ROOT" />
+            <RegistryValue Root="HKCU" Key="Software\Microsoft\SyntikX" Name="installed" Type="integer" Value="1" KeyPath="yes" />
+          </Component>
+        </Directory>
+      </Directory> -->
+        </Directory>
+        <!--<UIRef Id="WixUI_Minimal" />-->
+        <UI />
+        <MajorUpgrade AllowDowngrades="no" AllowSameVersionUpgrades="yes" MigrateFeatures="yes" Schedule="afterInstallValidate" DowngradeErrorMessage="Newer version of Nzbdrone is already installed." />
+        <Feature Id="DefaultFeature" Title="Main Feature" Level="1">
+            <ComponentRef Id="SX_APP_COMP" />
+            <!-- 
+      <ComponentRef Id="SX_START_SHORTCUT_COMP" />
+      <ComponentRef Id="SX_STARTUP_SHORTCUT_COMP" />
+      <ComponentRef Id="SX_DESKTOP_SHORTCUT_COMP" />
+
+      -->
+        </Feature>
+        <PropertyRef Id="NETFRAMEWORK40FULL" />
+        <Condition Message="This application requires .NET Framework 4.0 or later. Please install the .NET Framework then run this installer again.">NETFRAMEWORK40FULL</Condition>
+        <Icon Id="SX_ICON" SourceFile="..\_output\NzbDrone.exe" />
+        <InstallExecuteSequence>
+            <InstallInitialize />
+      <!--       <Custom Action="SX_START_ACTION" After="InstallFiles" /> -->
+            <InstallFinalize />
+        </InstallExecuteSequence>
+        <CustomAction Id="SX_START_ACTION" FileKey="CONSOLE_EXE_FILE" ExeCommand="" Execute="deferred" Impersonate="no" Return="asyncNoWait" />
+    </Product>
+</Wix>
\ No newline at end of file
diff --git a/wix/package.bat b/wix/package.bat
new file mode 100644
index 000000000..86495f562
--- /dev/null
+++ b/wix/package.bat
@@ -0,0 +1,4 @@
+SET BUILD_NUMBER=1.9.9.9
+
+"bin\candle.exe" -nologo "nzbdrone.wxs" -out "nzbdrone.wixobj"  -ext WixNetFxExtension -ext WixUIExtension
+"bin\light.exe" -nologo "nzbdrone.wixobj" -out "nzbdrone.msi"  -ext WixNetFxExtension -ext WixUIExtension
\ No newline at end of file