diff --git a/src/setup/win32/Include.wxi b/src/setup/win32/Include.wxi
index de253db3..248a0c31 100644
--- a/src/setup/win32/Include.wxi
+++ b/src/setup/win32/Include.wxi
@@ -11,13 +11,20 @@
   <?ifndef Version ?>
   <?define Version="1.0.0" ?>
   <?endif?>
+
+  <?define UpgradeGuid32="BE0B9FD8-45E2-4A8E-A0D8-1F774D074A78" ?>
+  <?define UpgradeGuid64="E8A4FA54-14B9-4FD1-8E00-7BC46555FDA0" ?>
   
   <?if $(var.Platform) = "x64" ?>
   <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
   <?define PlatformSimpleName="64-bit" ?>
+  <?define UpgradeGuid="$(var.UpgradeGuid64)" ?>
   <?else?>
   <?define ProgramFilesFolder="ProgramFilesFolder" ?>
   <?define PlatformSimpleName="32-bit" ?>
+  <?define UpgradeGuid="$(var.UpgradeGuid32)" ?>
   <?endif?>
   
+  <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_$(var.Platform).msm" ?>
+  
 </Include>
diff --git a/src/setup/win32/Product.wxs b/src/setup/win32/Product.wxs
index a32c0028..8edc1cb6 100644
--- a/src/setup/win32/Product.wxs
+++ b/src/setup/win32/Product.wxs
@@ -7,15 +7,27 @@
   <?include Include.wxi?>
 
   <Product
-      Id="*" Name="$(var.Name) ($(var.PlatformSimpleName))" Language="1033"
-      Version="$(var.Version)" Manufacturer="$(var.Author)"
-      UpgradeCode="E87C85E3-69FD-4F00-BBB4-69C5FD615D47">
+      Id="*"
+      UpgradeCode="$(var.UpgradeGuid)"
+      Name="$(var.Name) ($(var.PlatformSimpleName))"
+      Language="1033"
+      Version="$(var.Version)"
+      Manufacturer="$(var.Author)">
     
     <Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine" />
     <MajorUpgrade DowngradeErrorMessage="A newer version of $(var.Name) is already installed." />
     <MediaTemplate EmbedCab="yes" />
     <UIRef Id="WixUI_InstallDir" />
 
+    <?if $(var.Platform) = "x86" ?>
+    <Condition Message="You are running a 64-bit version of Windows. Please install the 64-bit version of $(var.Name) instead of the 32-bit version.">NOT Msix64</Condition>
+    <?endif ?>
+    
+    <!-- causes ICE61 warning, but stops user from installing many instances from nightly builds. -->
+    <Upgrade Id="$(var.UpgradeGuid)">
+      <UpgradeVersion Minimum="0.0.0.0" Property="UPGRADE" />
+    </Upgrade>
+
     <Feature Id="ProductFeature" Title="$(var.Name)">
       <ComponentGroupRef Id="ProductComponents" />
       <MergeRef Id="CRT" />
@@ -64,7 +76,7 @@
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="$(var.ProgramFilesFolder)">
         <Directory Id="INSTALLFOLDER" Name="$(var.Name)">
-          <Merge Id="CRT" Language="0" SourceFile="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_x86.msm" DiskId="1" />
+          <Merge Id="CRT" Language="0" SourceFile="$(var.CRT)" DiskId="1" />
         </Directory>
       </Directory>
       <Directory Id="ProgramMenuFolder" />