diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index a51cb1400..45fd6074e 100755
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -33,7 +33,7 @@
             <File Id='qtsql4dll' Name='qtsql4.dll' Source='$(var.QtDllDir)\qtsql4.dll' />
             <File Id='qtxml4dll' Name='qtxml4.dll' Source='$(var.QtDllDir)\qtxml4.dll' />
           </Component>
-          <Component Id='GuiTranslations' Guid='*'>
+          <Component Id='GuiTranslations' Guid='$(var.guiTranslationsGUID)'>
             <File Id='cppcheck_de.qm' Name='cppcheck_de.qm' Source='$(var.GuiBuildDir)\cppcheck_de.qm' />
             <File Id='cppcheck_en.qm' Name='cppcheck_en.qm' Source='$(var.GuiBuildDir)\cppcheck_en.qm' />
             <File Id='cppcheck_fi.qm' Name='cppcheck_fi.qm' Source='$(var.GuiBuildDir)\cppcheck_fi.qm' />
@@ -43,12 +43,12 @@
             <File Id='cppcheck_ru.qm' Name='cppcheck_ru.qm' Source='$(var.GuiBuildDir)\cppcheck_ru.qm' />
             <File Id='cppcheck_se.qm' Name='cppcheck_se.qm' Source='$(var.GuiBuildDir)\cppcheck_se.qm' />
           </Component>
-          <Component Id='BaseDocs' Guid='*'>
-            <File Id='authors.txt' Name='authors.txt' DiskId='1' Source='..\authors' KeyPath='yes' />
-            <File Id='readme.txt' Name='readme.txt' DiskId='1' Source='..\readme.txt' KeyPath='yes' />
+          <Component Id='BaseDocs' Guid='$(var.basedocsGUID)'>
+            <File Id='authors.txt' Name='authors.txt' DiskId='1' Source='..\authors' />
+            <File Id='readme.txt' Name='readme.txt' DiskId='1' Source='..\readme.txt' />
           </Component>
           <Component Id='GuiHelp' Guid='*'>
-            <File Id='online-help.qhc' Name='online-help.qhc' DiskId='1' Source='$(var.HelpDir)\online-help.qhc' KeyPath='yes' />
+            <File Id='onlinehelp.qhc' Name='online-help.qhc' DiskId='1' Source='$(var.HelpDir)\online-help.qhc' KeyPath='yes' />
           </Component>
           <!-- Cleanup runtime files installed by previous InnoSetup installer -->
           <Component Id='InnoSetupCleanup' Guid='4A3F299D-1EE1-468b-814B-D6577F0698CA'>
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index cba078c3b..d4c611c9d 100755
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -7,8 +7,10 @@
   <?define ProductManufacturer = "The Cppcheck team" ?>
   <?define ProductDescription = "Cppcheck is a tool for static analysis of C/C++ code" ?>
 
-  <?define ProductGUID = "{7214EC4C-8F10-4E56-8E99-0B9908E68774}" ?>
-  <?define ProductUpgradeCode = "{7E94124C-1CD1-433F-9423-4614E52300DD}" ?>
+  <?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 guiTranslationsGUID = "24738151-890D-4fcc-824C-DA7FF63E0D7F" ?>
+  <?define basedocsGUID = "9F62B23C-CD2B-4826-A567-6AB6F75A2AEA" ?>
 </Include>