diff --git a/src/setup/win32/Include.wxi b/src/setup/win32/Include.wxi
index bd7fc0d9..f45ee276 100644
--- a/src/setup/win32/Include.wxi
+++ b/src/setup/win32/Include.wxi
@@ -7,8 +7,9 @@
   <?define BinPath="../../../bin/$(var.Configuration)" ?>
   <?define ResPath="../../../res" ?>
   <?define ExtPath="../../../ext" ?>
-  <?define QtPath="C:\Qt\2010.02\qt\bin" ?>
-
+  <?define QtMajor="5" ?>
+  <?define QtPath="C:\Qt\5.6\mingw49_32\bin" ?>
+  
   <?ifndef Version ?>
   <?define Version="1.0.0" ?>
   <?endif?>
@@ -28,6 +29,6 @@
   <?define var.OpensslPath="openssl-win32" ?>
   <?endif?>
   
-  <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC100_CRT_$(var.Platform).msm" ?>
+  <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
   
 </Include>
diff --git a/src/setup/win32/Product.wxs b/src/setup/win32/Product.wxs
index 552f76d1..e792d78e 100644
--- a/src/setup/win32/Product.wxs
+++ b/src/setup/win32/Product.wxs
@@ -14,7 +14,7 @@
       Version="$(var.Version)"
       Manufacturer="$(var.Author)">
     
-    <Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine" />
+    <Package InstallerVersion="301" Compressed="yes" InstallScope="perMachine" />
     <MajorUpgrade DowngradeErrorMessage="A newer version of $(var.Name) is already installed." />
     <MediaTemplate EmbedCab="yes" />
     <UIRef Id="WixUI_InstallDir" />
@@ -119,11 +119,22 @@
           <fire:FirewallException Id="GuiFirewallException" Name="$(var.Name)" Scope="any" IgnoreFailure="yes" />
         </File>
 
-        <File Source="$(var.QtPath)\libgcc_s_dw2-1.dll" />
-        <File Source="$(var.QtPath)\mingwm10.dll" />
-        <File Source="$(var.QtPath)\QtCore4.dll" />
-        <File Source="$(var.QtPath)\QtGui4.dll" />
-        <File Source="$(var.QtPath)\QtNetwork4.dll" />
+        <?if 5 = $(var.QtMajor) ?>
+          <File Source="$(var.QtPath)\Qt5Core.dll" />
+          <File Source="$(var.QtPath)\Qt5Gui.dll" />
+          <File Source="$(var.QtPath)\Qt5Network.dll" />
+          <File Source="$(var.QtPath)\Qt5Svg.dll" />
+          <File Source="$(var.QtPath)\Qt5Widgets.dll" />
+          <File Source="$(var.QtPath)\libGLESV2.dll" />
+          <File Source="$(var.QtPath)\libEGL.dll" />
+          <File Source="$(var.QtPath)\libstdc++-6.dll" />
+          <File Source="$(var.QtPath)\libwinpthread-1.dll" />
+        <?else?>
+          <File Source="$(var.QtPath)\mingwm10.dll" CompanionFile="GuiProgram" />
+          <File Source="$(var.QtPath)\QtCore4.dll" CompanionFile="GuiProgram" />
+          <File Source="$(var.QtPath)\QtGui4.dll" CompanionFile="GuiProgram" />
+          <File Source="$(var.QtPath)\QtNetwork4.dll" CompanionFile="GuiProgram" />
+        <?endif?>
         
         <File Source="$(var.ExtPath)\bonjour\x64\dnssd.dll" />
 
diff --git a/src/setup/win32/synergy.sln b/src/setup/win32/synergy.sln
index d4490568..7063df52 100644
--- a/src/setup/win32/synergy.sln
+++ b/src/setup/win32/synergy.sln
@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "synergy", "synergy.wixproj", "{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}"
 EndProject
 Global
@@ -11,14 +13,13 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.ActiveCfg = Debug|x86
 		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x86.ActiveCfg = Debug|x86
 		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x86.Build.0 = Debug|x86
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.ActiveCfg = Debug|x64
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Debug|x64.Build.0 = Debug|x64
+		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.ActiveCfg = Release|x86
+		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.Build.0 = Release|x86
 		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x86.ActiveCfg = Release|x86
 		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x86.Build.0 = Release|x86
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.ActiveCfg = Release|x64
-		{D4BA9F39-6A35-4C8F-9CB2-67FCBE5CAB17}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE