diff --git a/src/Mod/CMakeLists.txt b/src/Mod/CMakeLists.txt
index 181d3ef91..d1f0736ae 100644
--- a/src/Mod/CMakeLists.txt
+++ b/src/Mod/CMakeLists.txt
@@ -47,3 +47,5 @@ endif(FREECAD_BUILD_SANDBOX)
 add_subdirectory(Surfaces)
 add_subdirectory(Ship)
 add_subdirectory(OpenSCAD)
+
+
diff --git a/src/WindowsInstaller/FreeCAD.wxs b/src/WindowsInstaller/FreeCAD.wxs
index ee21354a8..05a5d19fd 100644
--- a/src/WindowsInstaller/FreeCAD.wxs
+++ b/src/WindowsInstaller/FreeCAD.wxs
@@ -159,6 +159,8 @@
             <ComponentRef Id="CompModStartLibStartPage" />
             <ComponentRef Id="CompModStartDataStartPage" />
             <ComponentRef Id="CompModWeb" />
+            <ComponentRef Id="CompModOpenSCAD" />
+            <ComponentRef Id="CompModOpenSCADPly" />
             <ComponentRef Id="CompExampleData" />
 		
             <Feature Id="FeatModImage" Title="The Image module" Description="Module to handle pictures" Level="1">
diff --git a/src/WindowsInstaller/FreeCADModules.wxs b/src/WindowsInstaller/FreeCADModules.wxs
index e8d7e7db8..019ae14f8 100644
--- a/src/WindowsInstaller/FreeCADModules.wxs
+++ b/src/WindowsInstaller/FreeCADModules.wxs
@@ -52,6 +52,7 @@
             <?include ModStart.wxi ?>
             <?include ModWeb.wxi ?>
             <?include ModArch.wxi ?>
+            <?include ModOpenSCAD.wxi ?>
         </DirectoryRef>
     </Fragment>
 </Wix>
diff --git a/src/WindowsInstaller/ModOpenSCAD.wxi b/src/WindowsInstaller/ModOpenSCAD.wxi
new file mode 100644
index 000000000..3e5bae553
--- /dev/null
+++ b/src/WindowsInstaller/ModOpenSCAD.wxi
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   (c) Juergen Riegel (FreeCAD@juergen-riegel.net) 2012                       
+                                                                        
+   This file is part of the FreeCAD CAx development system.             
+                                                                        
+   This program is free software; you can redistribute it and/or modify 
+   it under the terms of the GNU Library General Public License (LGPL)  
+   as published by the Free Software Foundation; either version 2 of    
+   the License, or (at your option) any later version.                  
+   for detail see the LICENCE text file.                                
+                                                                        
+   FreeCAD is distributed in the hope that it will be useful,           
+   but WITHOUT ANY WARRANTY; without even the implied warranty of       
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        
+   GNU Library General Public License for more details.                 
+                                                                        
+   You should have received a copy of the GNU Library General Public    
+   License along with FreeCAD; if not, write to the Free Software       
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
+   USA                                                                  
+                                                                        
+   Juergen Riegel 2012                                                  
+-->
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Directory Id="ModOpenSCAD" Name="OpenSCAD" FileSource="../../Mod/OpenSCAD">
+        <Component Id="CompModOpenSCAD" Guid="54fb73e3-7c3a-4a43-b376-008dfae6d103" Win64='$(var.Win_64)' KeyPath="yes">
+            <File Id="OpenSCADInitPy" Name="Init.py" DiskId="1" />
+            <File Id="OpenSCADInitGuiPy" Name="InitGui.py" DiskId="1" />
+            <File Id="colorcodeshapesPy" Name="colorcodeshapes.py" DiskId="1" />
+            <File Id="expandplacementspy" Name="expandplacements.py" DiskId="1" />
+            <File Id="exportCSGpy" Name="exportCSG.py" DiskId="1" />
+            <File Id="importCSGpy" Name="importCSG.py" DiskId="1" />
+            <File Id="OpenSCAD_rcpy" Name="OpenSCAD_rc.py" DiskId="1" />
+            <File Id="OpenSCAD2Dgeompy" Name="OpenSCAD2Dgeom.py" DiskId="1" />
+            <File Id="OpenSCADCommandspy" Name="OpenSCADCommandspy" DiskId="1" />
+            <File Id="OpenSCADFeaturespy" Name="OpenSCADFeatures.py" DiskId="1" />
+            <File Id="OpenSCADUtilspy" Name="OpenSCADUtils.py" DiskId="1" />
+            <File Id="prototypepy" Name="prototype.py" DiskId="1" />
+            <File Id="replaceobjpy" Name="replaceobj.py" DiskId="1" />
+            <File Id="tokrulespy" Name="tokrules.py" DiskId="1" />
+        </Component>
+		<Directory Id="ModOpenSCADPly" Name="OpenSCADPly" FileSource="../../Mod/OpenSCAD/ply">
+	        <Component Id="CompModOpenSCADPly" Guid="870b896b-30f8-4d3b-b923-36536c0c2859" Win64='$(var.Win_64)' KeyPath="yes">
+	            <File Id="OpenSCADLibInitPy" Name="__init__.py" DiskId="1" />
+	            <File Id="OpenSCADLibREADME" Name="README" DiskId="1" />
+	            <File Id="OpenSCADLibyaccpy" Name="yacc.py" DiskId="1" />
+	            <File Id="OpenSCADLiblexpy" Name="lex.py" DiskId="1" />
+	        </Component>
+		</Directory>
+    </Directory>
+</Include>