diff --git a/build.cmd b/build.cmd
index 92e0a44f..f87bfb39 100644
--- a/build.cmd
+++ b/build.cmd
@@ -4,14 +4,16 @@ SETLOCAL
 
 SET CACHED_NUGET=%LocalAppData%\NuGet\NuGet.exe
 SET SOLUTION_PATH=%~dp0src\CodeFormatter.sln
-SET VS2015_BUILD_TOOLS_PATH="%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe"
+SET BUILD_TOOLS_PATH="%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe"
 
-IF NOT EXIST %VS2015_BUILD_TOOLS_PATH% (
-  echo In order to build or run this tool you need either Visual Studio 2015 Preview or
-  echo Microsoft Build Tools 2015 Preview tools installed.
+IF NOT EXIST %BUILD_TOOLS_PATH% (
+  echo In order to build or run this tool you need either Visual Studio 2015 or
+  echo Microsoft Build Tools 2015 tools installed.
+  echo.
+  echo Visit this page to download either:
+  echo.
+  echo http://www.visualstudio.com/en-us/downloads/visual-studio-2015-downloads-vs
   echo.
-  echo Visit http://www.visualstudio.com/en-us/downloads/visual-studio-2015-downloads-vs 
-  echo to download either.
   goto :eof
 )
 
@@ -26,4 +28,4 @@ IF EXIST "%~dp0src\packages" goto build
 
 :build
 
-"%ProgramFiles(x86)%\MSBuild\14.0\bin\MSBuild.exe" %SOLUTION_PATH% /p:OutDir="%~dp0bin " /nologo /m /v:m /flp:verbosity=normal %*
+%BUILD_TOOLS_PATH% %SOLUTION_PATH% /p:OutDir="%~dp0bin " /nologo /m /v:m /flp:verbosity=normal %*