diff --git a/wix/nzbdrone.wxs b/wix/nzbdrone.wxs
index 920d184a4..5ad4266a6 100644
--- a/wix/nzbdrone.wxs
+++ b/wix/nzbdrone.wxs
@@ -29,6 +29,7 @@
         <MajorUpgrade AllowDowngrades="no" AllowSameVersionUpgrades="yes" MigrateFeatures="yes" Schedule="afterInstallValidate" DowngradeErrorMessage="Newer version of Nzbdrone is already installed." />
         <Feature Id="Core" Title="NzbDrone Core" Description="NzbDrone Core" Level="1" Display='expand'>
             <ComponentRef Id="BIN_COMP" />
+            <ComponentGroupRef Id="OUTPUT_GROUP" />
         </Feature>
         <PropertyRef Id="NETFRAMEWORK40FULL" />
         <Property Id="INSTALL_WINDOWS_SERVICE" Value="1" />
diff --git a/wix/package.bat b/wix/package.bat
index 86495f562..97b6018c1 100644
--- a/wix/package.bat
+++ b/wix/package.bat
@@ -1,4 +1,7 @@
 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
+bin\heat.exe dir ..\_output\ -out _output.wxs -cg OUTPUT_GROUP -dr BIN_DIR -gg -scom -srd -sfrag -sreg -suid -svb6
+
+"bin\candle.exe" nzbdrone.wxs _output.wxs -ext WixNetFxExtension -ext WixUIExtension
+"bin\light.exe"  nzbdrone.wixobj _output.wixobj -out "nzbdrone.msi"  -ext WixNetFxExtension -ext WixUIExtension -b ..\_output
+