diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe
index 84a182c1..10edbec6 100644
Binary files a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe and b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe differ
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj
index f14d2823..2aaba187 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj
@@ -154,6 +154,7 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>"$(SolutionDir)..\Resources\ILMerge.exe" "$(TargetPath)" "$(SolutionDir)..\Lib\Ionic.Zip.Reduced.dll" /out:$(SolutionDir)WebsitePanel.Installer\Updater.exe /ndebug</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WebsitePanel/build.xml b/WebsitePanel/build.xml
index 3ed65a9c..8ad55090 100644
--- a/WebsitePanel/build.xml
+++ b/WebsitePanel/build.xml
@@ -236,9 +236,20 @@
                 ItemName="LocalizationToolkitMsi" />	
 		</MSBuild>
 		<Copy SourceFiles="@(LocalizationToolkitMsi)" DestinationFolder="$(LocalizationToolkitBuild)\%(RecursiveDir)" />
-	</Target>	
-
-	<Target Name="Build" DependsOnTargets="CreateLocalizationToolkitBuild">
+	</Target>
+	
+	<Target Name="CreateSetupBuild" DependsOnTargets="CreateLocalizationToolkitBuild">
+		
+		<!-- build MSI package -->
+		<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\Setup.WIX\Setup.Wix.wixproj" Properties="Configuration=$(BuildConfiguration)">
+			<Output
+                TaskParameter="TargetOutputs"
+                ItemName="WebsitePanelInstallerMsi" />	
+		</MSBuild>
+		<Copy SourceFiles="@(WebsitePanelInstallerMsi)" DestinationFolder="$(DeployFolder)\%(RecursiveDir)" />
+	</Target>
+	
+	<Target Name="Build" DependsOnTargets="CreateSetupBuild">
 		<!-- Do nothing -->
 	</Target>