diff --git a/build/Build.bat b/build/Build.bat
index 5cdcc0b9ee..8e9bacaa5a 100644
--- a/build/Build.bat
+++ b/build/Build.bat
@@ -5,7 +5,7 @@ SET version=%release%
 
 IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
 
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_NUMBER=%release% /p:BUILD_COMMENT=%comment%
+%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%
 
 echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt
 echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Data\dummy.txt
diff --git a/build/Build.proj b/build/Build.proj
index 06bdf4e942..ec20affd6a 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -161,13 +161,14 @@
    <!-- DONE -->
    <Message Text="Finished compiling projects" Importance="high" />
  </Target>
- 
- <Target Name="SetVersionNumber">
+
+ <Target Name="SetVersionNumber" Condition="'$(BUILD_RELEASE)'!=''">
     <!-- Match & replace 3 and 4 digit version numbers and -beta (if it's there) -->
-    <FileUpdate Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
+    <FileUpdate 
+      Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
       Regex="(\d+)\.(\d+)\.(\d+)(.(\d+))?"
-      ReplacementText="$(BUILD_NUMBER)"/>
-	  
+      ReplacementText="$(BUILD_RELEASE)"/>
+
     <FileUpdate Files="..\src\Umbraco.Core\Configuration\UmbracoVersion.cs"
       Regex="CurrentComment { get { return &quot;([a-zA-Z]+)?&quot;"
       ReplacementText="CurrentComment { get { return &quot;$(BUILD_COMMENT)&quot;"/>