diff --git a/msi/hudson.wxs b/msi/hudson.wxs
index 3e2ec59570d487f09ac624b9d3b3151b9c69ccf8..33f63c5c1b5c6ef3cce6e2a5d6cf9aa14eef7c83 100644
--- a/msi/hudson.wxs
+++ b/msi/hudson.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Product Name='Hudson ${var.VERSION}' Id='f8a1c07f-69d2-4fe1-a194-c5d563d44889' UpgradeCode='ca304bcd-a9a4-4178-8fac-e0505b1e05f3'
-    Language='1033' Codepage='1252' Version='${var.VERSION}' Manufacturer='Hudson project'>
+  <Product Name='Hudson $(var.VERSION)' Id='f8a1c07f-69d2-4fe1-a194-c5d563d44889' UpgradeCode='ca304bcd-a9a4-4178-8fac-e0505b1e05f3'
+    Language='1033' Codepage='1252' Version='0.$(var.VERSION).0' Manufacturer='Hudson project'>
 
     <Package Id='*' Keywords='Installer' Description="Hudson"
       Comments='Continuous Integration Server'
@@ -9,9 +9,9 @@
       <Media Id='1' Cabinet='hudson.cab' EmbedCab='yes'/>
       <Directory Id='TARGETDIR' Name='SourceDir'>
         <Directory Id='ProgramFilesFolder' Name='PFiles'>
-          <Directory Id='Hudson' Name='Hudson' FileSource=".">
+          <Directory Id='HudsonDir' Name='Hudson' FileSource=".">
               <Component Id='Main' Guid='8fd00c9c-e018-46d6-9135-67696ea0bcbf'>
-                <File Id="HudsonExe" Name="hudson.exe" DiskId='1' KeyPath='yes'/>
+                <File Name="hudson.exe" DiskId='1' KeyPath='yes'/>
                 <ServiceInstall Id="HudsonService"
                      Name="hudson"
                      DisplayName="Hudson"
@@ -30,6 +30,7 @@
 
     <Feature Id='Complete' Level='1'>
       <ComponentRef Id='Main' />
+      <ComponentGroupRef Id='DataComponents' />
     </Feature>
 
     <!-- launch a browser at the end of the installation -->
diff --git a/msi/readme.txt b/msi/readme.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6917df6689ae985605a926afaa42c9b39b0b1c12
--- /dev/null
+++ b/msi/readme.txt
@@ -0,0 +1 @@
+To scan a directory, use Harvest
diff --git a/msi/run-heat.sh b/msi/run-heat.sh
new file mode 100755
index 0000000000000000000000000000000000000000..de6accd0eb077b7269d363c74048949887a80907
--- /dev/null
+++ b/msi/run-heat.sh
@@ -0,0 +1,4 @@
+#!/bin/bash -ex
+heat dir data -o data.wxs -sfrag -gg -cg DataComponents -dr HudsonDir -var var.DataDir
+candle -dVERSION=1.999 -dDataDir=data hudson.wxs data.wxs
+light -o hudson.msi hudson.wixobj data.wixobj