diff --git a/win_installer/config.wxi b/win_installer/config.wxi
index 4e9de6f25..73fb7c0f9 100644
--- a/win_installer/config.wxi
+++ b/win_installer/config.wxi
@@ -4,6 +4,7 @@
   <?define GuiBuildDir = "..\bin" ?>
   <?define TranslationsDir = "..\gui" ?>
   <?define CfgsDir = "..\cfg" ?>
+  <?define PtfsDir = "..\platforms" ?>
   <?define AddonsDir = "..\addons" ?>
   <?define QtDllDir = "..\bin" ?>
 
diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index 79f940ab1..22de692ca 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -75,6 +75,12 @@
               <File Id='windows.cfg' Name='windows.cfg' Source='$(var.CfgsDir)\windows.cfg' />
             </Component>
           </Directory>
+          <Directory Id='PtfsFolder' Name='platforms'>
+            <Component Id='OptionalPtfs' Guid='$(var.optionalPtfsGUID)'>
+              <File Id='unix32unsigned.xml' Name='unix32-unsigned.xml' Source='$(var.PtfsDir)\unix32-unsigned.xml' />
+              <File Id='unix64unsigned.xml' Name='unix64-unsigned.xml' Source='$(var.PtfsDir)\unix64-unsigned.xml' />
+            </Component>
+          </Directory>
           <Directory Id='AddonsFolder' Name='addons'>
             <Component Id='Addons' Guid='$(var.addonsGUID)'>
               <File Id='cppcheckdata.py' Name='cppcheckdata.py' Source='$(var.AddonsDir)\cppcheckdata.py' />
@@ -116,8 +122,8 @@
             <RemoveFile Id='qtgui4dll' On='install' Name='qtgui4.dll' />
           </Component>
         </Directory>
+        <Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" />
       </Directory>
-      <Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" />
 
       <Directory Id='ProgramMenuFolder' Name='Programs' >
         <Directory Id='ProgramMenuDir' Name='$(var.ProductName)'>
@@ -154,6 +160,9 @@
       <Feature Id='ConfigFiles' Title='Additional configurations' AllowAdvertise='no' Description='Provide additional configuration files, for example for WinAPI, GTK and SDL' Level='1'>
         <ComponentRef Id='OptionalCfgs' />
       </Feature>
+      <Feature Id='PlatformFiles' Title='Additional platforms' AllowAdvertise='no' Description='Provide additional platform files, for example unix platforms with unsigned types as default' Level='1'>
+        <ComponentRef Id='OptionalPtfs' />
+      </Feature>
       <Feature Id='PythonAddons' Title='Python addons' AllowAdvertise='no'  Description='Contains several addons requiring python' Level='2'>
         <ComponentRef Id='Addons' />
       </Feature>
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index 6c722ede9..338080497 100644
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -16,6 +16,7 @@
   <?define guiTranslationsGUID = "24738151-890D-4fcc-824C-DA7FF63E0D7F" ?>
   <?define mandatoryCfgsGUID = "EE95621C-25E7-491A-8DE9-EA6E6967C176" ?>
   <?define optionalCfgsGUID = "3A8AE067-5F41-4D29-A35C-CC0FAB648608" ?>
+  <?define optionalPtfsGUID = "F9EB9DB1-C0F1-4548-A5B0-27B51CD43A34" ?>
   <?define basedocsGUID = "9F62B23C-CD2B-4826-A567-6AB6F75A2AEA" ?>
   <?define registrykeysGUID = "8CB515B1-6EF6-4A2A-97A0-F8A13E3A505E" ?>
 </Include>
\ No newline at end of file