diff --git a/TimberWix/Product.wxs b/TimberWix/Product.wxs
index e386b6e..e6de9d7 100644
--- a/TimberWix/Product.wxs
+++ b/TimberWix/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="TimberWinR" Language="1033" Version="1.1.0.0" Manufacturer="Vistaprint" UpgradeCode="5c2b6a95-34d5-4131-8fb0-5c97214df942">
+  <Product Id="*" Name="TimberWinR" Language="1033" Version="$(var.VersionNumber)" Manufacturer="Vistaprint" UpgradeCode="5c2b6a95-34d5-4131-8fb0-5c97214df942">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <Property Id="CONFIGFILE">default.json</Property>
     <Property Id="LOGDIR">c:\logs</Property>
diff --git a/TimberWix/TimberWinR.Wix.wixproj b/TimberWix/TimberWinR.Wix.wixproj
index a5f87b3..8a8d947 100644
--- a/TimberWix/TimberWinR.Wix.wixproj
+++ b/TimberWix/TimberWinR.Wix.wixproj
@@ -22,7 +22,7 @@
     </WixVariables>
     <CompilerAdditionalOptions>
     </CompilerAdditionalOptions>
-    <LinkerAdditionalOptions>
+    <LinkerAdditionalOptions>    
     </LinkerAdditionalOptions>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
@@ -50,11 +50,62 @@
   <PropertyGroup>
     <PreBuildEvent />
   </PropertyGroup>
+  <Target Name="BeforeBuild">
+    <!-- Read the version from the to-be-installed .exe -->   
+    <GetAssemblyIdentity AssemblyFiles="..\TimberWinR.ServiceHost\bin\$(Configuration)\TimberWinR.ServiceHost.exe">
+      <Output TaskParameter="Assemblies" ItemName="AsmInfo" />
+    </GetAssemblyIdentity>
+    <!-- Create the MSBuild property $(VersionNumber) -->
+    <CreateProperty Value="%(AsmInfo.Version)">
+      <Output TaskParameter="Value" PropertyName="VersionNumber" />
+    </CreateProperty>
+
+    <!-- Create the WiX preprocessor variable $(var.VersionNumber) -->
+    <CreateProperty Value="$(DefineConstants);VersionNumber=$(VersionNumber)">
+      <Output TaskParameter="Value" PropertyName="DefineConstants" />
+    </CreateProperty>
+
+    <!-- Update the MSBuild properties $(TargetName), etc. -->
+    <CreateProperty Value="$(SolutionName)-$(Platform)-$(VersionNumber)">
+      <Output TaskParameter="Value" PropertyName="TargetName" />
+    </CreateProperty>
+    <CreateProperty Value="$(TargetName)$(TargetExt)">
+      <Output TaskParameter="Value" PropertyName="TargetFileName" />
+    </CreateProperty>
+    <CreateProperty Value="$(TargetName)$(TargetPdbExt)">
+      <Output TaskParameter="Value" PropertyName="TargetPdbName" />
+    </CreateProperty>
+    <CreateProperty Value="$(TargetDir)$(TargetFileName)">
+      <Output TaskParameter="Value" PropertyName="TargetPath" />
+    </CreateProperty>
+    <CreateProperty Value="$(TargetPdbDir)$(TargetPdbName)">
+      <Output TaskParameter="Value" PropertyName="TargetPdbPath" />
+    </CreateProperty>
+
+    <!-- Update the MSBuild property from which candle.exe args are derived -->
+    <CreateProperty Value="
+    Configuration=$(ConfigurationName);
+    OutDir=$(OutDir);
+    Platform=$(PlatformName);
+    ProjectDir=$(ProjectDir);
+    ProjectExt=$(ProjectExt);
+    ProjectFileName=$(ProjectFileName);
+    ProjectName=$(ProjectName);
+    ProjectPath=$(ProjectPath);
+    TargetDir=$(TargetDir);
+    TargetExt=$(TargetExt);
+    TargetFileName=$(TargetFileName);
+    TargetName=$(TargetName);
+    TargetPath=$(TargetPath);
+  ">
+      <Output TaskParameter="Value" PropertyName="ProjectDefineConstants" />
+    </CreateProperty>
+  </Target>
+  
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
 	Other similar extension points exist, see Wix.targets.
-	<Target Name="BeforeBuild">
-  </Target>
+	
 	<Target Name="AfterBuild">
 	</Target>
 	-->