diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.sln b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.sln
index bb896547..efcd8f6a 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.sln
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.sln
@@ -2,6 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{129305D5-A9E6-4DCE-BFF6-41809E13EEEE}"
 	ProjectSection(SolutionItems) = preProject
+		..\..\WebsitePanel\build.xml = ..\..\WebsitePanel\build.xml
 		..\..\LICENSE.txt = ..\..\LICENSE.txt
 		..\..\Readme.htm = ..\..\Readme.htm
 		..\..\ReleaseNotes.htm = ..\..\ReleaseNotes.htm
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe
index 10edbec6..d60bc93f 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.Installer/WebsitePanel.Installer.csproj b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/WebsitePanel.Installer.csproj
index 6aed9ae8..619ac015 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/WebsitePanel.Installer.csproj
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/WebsitePanel.Installer.csproj
@@ -256,7 +256,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="application.ico" />
-    <Content Include="Updater.exe" />
+    <EmbeddedResource Include="Updater.exe" />
     <Content Include="websitepanel.ico" />
   </ItemGroup>
   <ItemGroup>
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj
index 2aaba187..68e87839 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Updater/WebsitePanel.Updater.csproj
@@ -150,9 +150,12 @@
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
-  <Target Name="AfterBuild">
-  </Target>
   -->
+
+  <Target Name="AfterBuild">
+    <Exec Command="$(ProjectDir)..\..\Resources\ILMerge.exe &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\..\Lib\Ionic.Zip.Reduced.dll&quot; /out:$(ProjectDir)..\WebsitePanel.Installer\Updater.exe /ndebug" />
+  </Target>
+  
   <PropertyGroup>
     <PostBuildEvent>
     </PostBuildEvent>
diff --git a/WebsitePanel/build.xml b/WebsitePanel/build.xml
index 8ad55090..7c57b67f 100644
--- a/WebsitePanel/build.xml
+++ b/WebsitePanel/build.xml
@@ -240,6 +240,9 @@
 	
 	<Target Name="CreateSetupBuild" DependsOnTargets="CreateLocalizationToolkitBuild">
 		
+    <!-- Compile updater.exe -->
+    <MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\WebsitePanel.Updater\WebsitePanel.Updater.csproj" Properties="Configuration=$(BuildConfiguration)" />
+    
 		<!-- build MSI package -->
 		<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\Setup.WIX\Setup.Wix.wixproj" Properties="Configuration=$(BuildConfiguration)">
 			<Output