Index: setup/Plugins/WtiSetup/Variables.wxi
===================================================================
diff -u -rc891c010c2d22c3303983631dac57cf8112837e2 -r73f65e27d9facf2f4e0abc1f407b64a52fe10bd8
--- setup/Plugins/WtiSetup/Variables.wxi	(.../Variables.wxi)	(revision c891c010c2d22c3303983631dac57cf8112837e2)
+++ setup/Plugins/WtiSetup/Variables.wxi	(.../Variables.wxi)	(revision 73f65e27d9facf2f4e0abc1f407b64a52fe10bd8)
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-  <!--Version:-->
-  <?define Major="0" ?>
-  <?define Minor="5" ?>
-  <?define Build="0" ?>
-  <!--Revision is defined in GenerateVariables.wxi-->
-  <?define ReleaseVersion="0.5.0" ?>
+  <!--
+    BUILD_NUMBER is an environment variable, for example defined by buildserver.
+    ReleaseVersion is defined as custom variable in WtiSetup.wixproj.
+    Revision is defined in GenerateVariables.wxi, which is create at prebuild step.
+  -->
+  <?ifdef env.BUILD_NUMBER ?>
+  <?define FullReleaseVersion="$(var.ReleaseVersion).$(env.BUILD_NUMBER)" ?>
+  <?else?>
   <?define FullReleaseVersion="$(var.ReleaseVersion).$(var.Revision)" ?>
+  <?endif?>
   
   <?define ApplicationFullName="!(loc.ApplicationLongName) $(var.FullReleaseVersion)" ?>
 </Include>
Index: setup/Plugins/WtiSetup/WtiSetup.wixproj
===================================================================
diff -u -r2b7696eba4d68aa5199f212a187245087fd5c310 -r73f65e27d9facf2f4e0abc1f407b64a52fe10bd8
--- setup/Plugins/WtiSetup/WtiSetup.wixproj	(.../WtiSetup.wixproj)	(revision 2b7696eba4d68aa5199f212a187245087fd5c310)
+++ setup/Plugins/WtiSetup/WtiSetup.wixproj	(.../WtiSetup.wixproj)	(revision 73f65e27d9facf2f4e0abc1f407b64a52fe10bd8)
@@ -6,7 +6,17 @@
     <ProductVersion>3.10</ProductVersion>
     <ProjectGuid>3ccb05db-c7b3-4ef7-b41d-22b6d2a3774e</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>Wti Setup</OutputName>
+	<!-- 
+		Custom Field: ReleaseVersion
+		Field is injected into WiX with the same name to make it available there as well.
+	-->
+	<ReleaseVersion>0.5.0</ReleaseVersion>
+	<!--
+		Environment Variable: BUILD_NUMBER
+		Field could be set by BuildServer. If not present, it will be skipped.
+	-->
+    <OutputName Condition=" '$(BUILD_NUMBER)' == '' ">Wti Setup ($(ReleaseVersion))</OutputName>
+    <OutputName Condition=" '$(BUILD_NUMBER)' != '' ">Wti Setup ($(ReleaseVersion).$(BUILD_NUMBER))</OutputName>
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
@@ -15,15 +25,12 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug;ApplicationBinFolderPath=..\..\..\src\DeltaShell\DeltaShell.Gui\bin</DefineConstants>
+    <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <SuppressPdbOutput>True</SuppressPdbOutput>
-    <WixVariables>
-    </WixVariables>
-    <DefineConstants>ApplicationBinFolder=..\..\..\src\DeltaShell\DeltaShell.Gui\bin;FullReleaseVersion=$(FullReleaseVersion)</DefineConstants>
     <Cultures>nl-NL</Cultures>
     <SuppressAllWarnings>True</SuppressAllWarnings>
     <Pedantic>False</Pedantic>
@@ -91,6 +98,9 @@
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <PropertyGroup>
+    <DefineConstants>$(DefineConstants);ReleaseVersion=$(ReleaseVersion);ApplicationBinFolder=..\..\..\src\DeltaShell\DeltaShell.Gui\bin;</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup>
     <PreBuildEvent>"$(WIX)bin\heat.exe" dir $(ProjectDir)..\..\..\src\DeltaShell\DeltaShell.Gui\bin -cg WtiApplicationComponents -gg -dr INSTALLDIR -var var.ApplicationBinFolder -sfrag -sreg -srd -o "$(ProjectDir)WtiPayload.wxs"
 $(ProjectDir)..\..\..\svn_insert_version.cmd $(ProjectDir) GenerateVariables.wxi.svn GenerateVariables.wxi%3b</PreBuildEvent>
   </PropertyGroup>