diff --git a/win_installer/cli.wxs b/win_installer/cli.wxs
index 83b8d9bb4..db707d8b9 100755
--- a/win_installer/cli.wxs
+++ b/win_installer/cli.wxs
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='windows-1252'?>
-<?define ProductName = "Cppcheck 1.39" ?>
-<?define ProductVersion = "1.39" ?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <?include productInfo.wxi ?>
   <Product Name='$(var.ProductName)' Id='88DE59C3-7640-47A2-A047-7289807AE3BA' UpgradeCode='DDB850E4-F8DE-4290-BDF1-AC12475DEE80'
     Language='1033' Codepage='1252' Version='$(var.ProductVersion)' Manufacturer='The Cppcheck team'>
 
@@ -16,7 +15,7 @@
       <Directory Id='ProgramFilesFolder' Name='PFiles'>
         <Directory Id='INSTALLDIR' Name='$(var.ProductName)'>
           <Component Id='Executable' Guid='E1435616-5041-4079-BC4B-C4805BEEDAF9'>
-            <File Id='cppcheckexe' Name='cppcheck.exe' DiskId='1' Source='cppcheck.exe' KeyPath='yes' />
+            <File Id='cppcheckexe' Name='cppcheck.exe' DiskId='1' Source='$(var.CliBuildDir)\cppcheck.exe' KeyPath='yes' />
           </Component>
           <Component Id='Authors' Guid='DA54245B-7A5D-481B-A930-D2C9FDD95E19'>
             <File Id='authorstxt' Name='authors.txt' DiskId='1' Source='..\authors' KeyPath='yes' />
diff --git a/win_installer/cppcheck.wixproj b/win_installer/cppcheck.wixproj
new file mode 100644
index 000000000..e2555414f
--- /dev/null
+++ b/win_installer/cppcheck.wixproj
@@ -0,0 +1,23 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <DefineSolutionProperties>false</DefineSolutionProperties>
+    
+    <WixToolPath Condition="'$(WixToolPath)' == ''">$(PROGRAMFILES)\Windows Installer XML v3\bin\</WixToolPath>
+    <WixTargetsPath Condition="'$(WixTargetsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>
+    
+    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    
+    <OutputName Condition=" '$(ProductVersion)' != '' ">cppcheck-$(ProductVersion)-$(Platform)-Setup</OutputName>
+    <OutputPath>$(Configuration)\$(Platform)\</OutputPath>
+    <IntermediateOutputPath>Tmp\$(Configuration)\$(Platform)\</IntermediateOutputPath>
+    <OutputType>package</OutputType>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <!-- <WixExtension Include="$(WixToolPath)WixUIExtension.dll" /> -->
+    <Compile Include="cppcheck.wxs"/>
+  </ItemGroup>
+  
+  <Import Project="$(WixTargetsPath)"/>
+</Project>
diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index 1b6d37e71..e9988d987 100755
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='windows-1252'?>
-<?include productInfo.wxi ?> 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <?include productInfo.wxi ?>
   <Product Name='$(var.ProductName)' Id='*' UpgradeCode='$(var.ProductUpgradeCode)'
     Language='1033' Codepage='1252' Version='$(var.ProductVersion)' Manufacturer='The Cppcheck team'>
 
@@ -15,11 +15,11 @@
       <Directory Id='ProgramFilesFolder' Name='PFiles'>
         <Directory Id='INSTALLDIR' Name='$(var.ProductNameShort)'>
           <Component Id='cppcheck.exe' Guid='$(var.cppcheckGUID)'>
-            <File Id='cppcheck.exe' Name='cppcheck.exe' DiskId='1' Source='cppcheck.exe' KeyPath='yes' />
+            <File Id='cppcheck.exe' Name='cppcheck.exe' DiskId='1' Source='$(var.CliBuildDir)\cppcheck.exe' KeyPath='yes' />
             <Environment Id='UpdatePath' Name='PATH' Action='set' System='yes' Part='last' Value='[INSTALLDIR]' />
           </Component>
           <Component Id='gui.exe' DiskId='1' Guid='$(var.guiGUID)'>
-            <File Id='gui.exe' Name='gui.exe' Source='gui.exe' KeyPath='yes'>
+            <File Id='gui.exe' Name='gui.exe' Source='$(var.GuiBuildDir)\gui.exe' KeyPath='yes'>
               <Shortcut Id='startmenuGui' Directory="ProgramMenuDir" Name="Cppcheck"
                   WorkingDirectory='INSTALLDIR' Icon="gui.exe" IconIndex="0" Advertise="yes" />
             </File>
@@ -36,7 +36,7 @@
           </Component>
           <Component Id='manual.pdf' Guid='*'>
             <File Id='manual.pdf' Name='manual.pdf' DiskId='1' Source='manual.pdf' KeyPath='yes'>
-              <Shortcut Id='startmenuManual' Directory="ProgramMenuDir" Name="manual.pdf" Advertise="no" />
+              <Shortcut Id='startmenuManual' Directory="ProgramMenuDir" Name="Manual" Advertise="yes" />
             </File>
           </Component>
         </Directory>
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index 45e2644c5..7040f746b 100755
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-<?define ProductName = "Cppcheck 1.39" ?>
-<?define ProductNameShort = "Cppcheck" ?>
-<?define ProductVersion = "1.39.0" ?>
-<?define ProductGUID = "{7214EC4C-8F10-4E56-8E99-0B9908E68774}" ?>
-<?define ProductUpgradeCode = "{7E94124C-1CD1-433F-9423-4614E52300DD}" ?>
-<?define cppcheckGUID = "1c31dd76-07fa-4420-b9b5-5463742d6a48" ?>
-<?define guiGUID = "4102893e-5237-4011-9d70-7d9067623372" ?>
+  <?define ProductName = "Cppcheck 1.39" ?>
+  <?define ProductNameShort = "Cppcheck" ?>
+  <?define ProductVersion = "1.39.0" ?>
+  <?define ProductGUID = "{7214EC4C-8F10-4E56-8E99-0B9908E68774}" ?>
+  <?define ProductUpgradeCode = "{7E94124C-1CD1-433F-9423-4614E52300DD}" ?>
+  <?define cppcheckGUID = "1c31dd76-07fa-4420-b9b5-5463742d6a48" ?>
+  <?define guiGUID = "4102893e-5237-4011-9d70-7d9067623372" ?>
+
+  <?ifndef Platform ?> <!-- if platform NOT defined -->
+    <?define Platform = "x86" ?>
+  <?endif ?>
+
+  <?define CliBuildDir = "..\cli\release" ?>
+  <?define GuiBuildDir = "..\gui\release" ?>
 </Include>