diff --git a/resources/install/build.xml b/resources/install/build.xml
index aa5ebbf81..3a283478f 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -489,7 +489,29 @@
         </exec>
 
         <!-- Bootstrap the MSI into an EXE -->
+        <copy
+                file="${inst.resrc}/windows/setup.exe"
+                todir="${windows.app.dir}/tmp"
+                overwrite="true" />
         <exec
+                executable="${inst.resrc}\windows\msistuff.exe"
+                dir="${windows.app.dir}/tmp"
+                failonerror="true">
+            <arg value="setup.exe" />
+            <arg value="/v" />
+            <arg value="200" />
+        	<arg value="/n" />
+        	<arg value="${application.name}" />
+        	<arg value="/d" />
+            <arg value="setup.msi" />
+        	<arg value="/b" />
+            <arg value="setup.msi" />
+        </exec>
+        <copy
+                file="${windows.app.dir}/tmp/setup.exe"
+                tofile="${windows.app.dir}/${package.name}-${sip-communicator.version}-msi.exe"
+                overwrite="true" />
+        <!--exec
                 executable="C:\Program Files\WiX\setupbld.exe"
                 dir="${light.dir}"
                 failonerror="true">
@@ -499,7 +521,7 @@
             <arg value="${windows.app.dir}\tmp\setup.msi" />
             <arg value="-setup" />
             <arg value="C:\Program Files\WiX\setup.exe" />
-        </exec>
+        </exec-->
         <exec executable="mt.exe" dir="${windows.app.dir}" failonerror="true">
             <arg value="-manifest" />
             <arg value="${inst.resrc}\windows\setup.exe.manifest" />
diff --git a/resources/install/windows/installer-windows.wxs b/resources/install/windows/installer-windows.wxs
index ade3cd4a7..fe6583602 100644
--- a/resources/install/windows/installer-windows.wxs
+++ b/resources/install/windows/installer-windows.wxs
@@ -243,6 +243,7 @@
             <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
 
             <Property Id="ARPNOMODIFY" Value="1" />
+            <Property Id="ARPNOREPAIR" Value="1" />
         </UI>
 
         <UIRef Id="WixUI_Common" />
diff --git a/resources/install/windows/msistuff.exe b/resources/install/windows/msistuff.exe
new file mode 100644
index 000000000..b8da823a0
Binary files /dev/null and b/resources/install/windows/msistuff.exe differ
diff --git a/resources/install/windows/msistuff.exe.manifest b/resources/install/windows/msistuff.exe.manifest
new file mode 100644
index 000000000..6e74a0962
--- /dev/null
+++ b/resources/install/windows/msistuff.exe.manifest
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"><security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel></requestedPrivileges></security></trustInfo>
+</assembly>
\ No newline at end of file
diff --git a/resources/install/windows/setup.exe b/resources/install/windows/setup.exe
new file mode 100644
index 000000000..a6b29a005
Binary files /dev/null and b/resources/install/windows/setup.exe differ