diff --git a/buildSetupAndRunTests.bat b/buildSetupAndRunTests.bat
index 9d804633a4..fe13d7deeb 100644
--- a/buildSetupAndRunTests.bat
+++ b/buildSetupAndRunTests.bat
@@ -1,6 +1,6 @@
 @echo This script simulates what the build server is doing
 @rem  /p:AdditionalBuildProperties="/v:d /p:MSBuildTargetsVerbose=true"
-%windir%\microsoft.net\framework\v4.0.20506\msbuild src\Automated.proj /p:ArtefactsOutputDir="%CD%\build" /p:TestReportsDir="%CD%\build"
+%windir%\microsoft.net\framework\v4.0.21006\msbuild src\Automated.proj /p:ArtefactsOutputDir="%CD%\build" /p:TestReportsDir="%CD%\build"
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @exit /B 0
 :err
diff --git a/clean.bat b/clean.bat
index 3269a82239..54cb80f764 100755
--- a/clean.bat
+++ b/clean.bat
@@ -1,2 +1,2 @@
-%windir%\microsoft.net\framework\v4.0.20506\msbuild /m /t:clean SharpDevelop.sln "/p:FSharpBuildTasksPath=%CD%\src\AddIns\BackendBindings\FSharp\RequiredLibraries" "/p:Platform=Any CPU"
+%windir%\microsoft.net\framework\v4.0.21006\msbuild /m /t:clean SharpDevelop.sln "/p:FSharpBuildTasksPath=%CD%\src\AddIns\BackendBindings\FSharp\RequiredLibraries" "/p:Platform=Any CPU"
 @IF %ERRORLEVEL% NEQ 0 PAUSE
\ No newline at end of file
diff --git a/debugbuild.bat b/debugbuild.bat
index 7396279552..14d064863e 100755
--- a/debugbuild.bat
+++ b/debugbuild.bat
@@ -1,4 +1,4 @@
-%windir%\microsoft.net\framework\v4.0.20506\msbuild /m SharpDevelop.sln /p:Configuration=Debug "/p:FSharpBuildTasksPath=%CD%\src\AddIns\BackendBindings\FSharp\RequiredLibraries" "/p:Platform=Any CPU"
+%windir%\microsoft.net\framework\v4.0.21006\msbuild /m SharpDevelop.sln /p:Configuration=Debug "/p:FSharpBuildTasksPath=%CD%\src\AddIns\BackendBindings\FSharp\RequiredLibraries" "/p:Platform=Any CPU"
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @exit /B 0
 :err
diff --git a/releasebuild.bat b/releasebuild.bat
index 68740870ee..d9bdeddeb7 100755
--- a/releasebuild.bat
+++ b/releasebuild.bat
@@ -1,4 +1,4 @@
-%windir%\microsoft.net\framework\v4.0.20506\msbuild /m /property:Configuration=Release SharpDevelop.sln "/p:FSharpBuildTasksPath=%CD%\src\AddIns\BackendBindings\FSharp\RequiredLibraries" "/p:Platform=Any CPU"
+%windir%\microsoft.net\framework\v4.0.21006\msbuild /m /property:Configuration=Release SharpDevelop.sln "/p:FSharpBuildTasksPath=%CD%\src\AddIns\BackendBindings\FSharp\RequiredLibraries" "/p:Platform=Any CPU"
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @exit /B 0
 :err
diff --git a/src/Automated.proj b/src/Automated.proj
index d0e813dce2..1edc9cda14 100644
--- a/src/Automated.proj
+++ b/src/Automated.proj
@@ -22,7 +22,7 @@
 			(but this works using the command line) -->
 		<!-- B) The Wix task assembly is locked if we do not use a separate MSBuild process -->
 		<!-- C) We need to use MSBuild 4.0, but the build server uses MSBuild 2.0 -->
-		<MSBuildExecutable>&quot;$(MSBuildBinPath)\..\v4.0.20506\msbuild.exe&quot;</MSBuildExecutable>
+		<MSBuildExecutable>&quot;$(MSBuildBinPath)\..\v4.0.21006\msbuild.exe&quot;</MSBuildExecutable>
 		<BuildProperties>/p:Configuration=Release</BuildProperties>
 		<BuildProperties>$(BuildProperties) &quot;/p:SharpDevelopBinPath=$(SharpDevelopBin)&quot;</BuildProperties>
 		<BuildProperties>$(BuildProperties) &quot;/p:BooBinPath=$(SharpDevelopSrc)\AddIns\BackendBindings\Boo\RequiredLibraries&quot;</BuildProperties>