diff --git a/buildSetupAndRunTests.bat b/buildSetupAndRunTests.bat
index 6f913fab63..0ce4e4180d 100755
--- 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.30128\msbuild src\Automated.proj /p:ArtefactsOutputDir="%CD%\build" /p:TestReportsDir="%CD%\build"
+%windir%\microsoft.net\framework\v4.0.30319\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 a40479eaf5..fe06abd3ec 100755
--- a/clean.bat
+++ b/clean.bat
@@ -1,4 +1,4 @@
-%windir%\microsoft.net\framework\v4.0.30128\msbuild /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Debug
+%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Debug
 @IF %ERRORLEVEL% NEQ 0 PAUSE
-%windir%\microsoft.net\framework\v4.0.30128\msbuild /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Release
+%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /t:clean "/p:Platform=Any CPU" /p:Configuration=Release
 @IF %ERRORLEVEL% NEQ 0 PAUSE
\ No newline at end of file
diff --git a/debugbuild.bat b/debugbuild.bat
index 44bfb9d8db..f39954f3bb 100755
--- a/debugbuild.bat
+++ b/debugbuild.bat
@@ -1,4 +1,4 @@
-%windir%\microsoft.net\framework\v4.0.30128\msbuild /m SharpDevelop.sln /p:Configuration=Debug "/p:Platform=Any CPU"
+%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /p:Configuration=Debug "/p:Platform=Any CPU"
 @IF %ERRORLEVEL% NEQ 0 GOTO err
 @exit /B 0
 :err
diff --git a/releasebuild.bat b/releasebuild.bat
index ac3b28f13a..cb115d984f 100755
--- a/releasebuild.bat
+++ b/releasebuild.bat
@@ -1,4 +1,4 @@
-%windir%\microsoft.net\framework\v4.0.30128\msbuild /m SharpDevelop.sln /p:Configuration=Release "/p:Platform=Any CPU"
+%windir%\microsoft.net\framework\v4.0.30319\msbuild /m SharpDevelop.sln /p:Configuration=Release "/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 308da2b2a1..faed2d6889 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.30128\msbuild.exe&quot;</MSBuildExecutable>
+		<MSBuildExecutable>&quot;$(MSBuildBinPath)\..\v4.0.30319\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>
diff --git a/src/Main/StartUp/Project/SharpDevelopMain.cs b/src/Main/StartUp/Project/SharpDevelopMain.cs
index 02dcc33070..2a6d89deeb 100644
--- a/src/Main/StartUp/Project/SharpDevelopMain.cs
+++ b/src/Main/StartUp/Project/SharpDevelopMain.cs
@@ -118,8 +118,10 @@ namespace ICSharpCode.SharpDevelop
 		
 		static bool CheckEnvironment()
 		{
-			if (Environment.Version < new Version(4, 0, 30128)) {
-				MessageBox.Show("This version of SharpDevelop requires .NET 4 RC. You are using: " + Environment.Version);
+			// Safety check: our setup already checks that .NET 4 is installed, but we manually check the .NET version in case SharpDevelop is
+			// used on another machine than it was installed on (e.g. "SharpDevelop on USB stick")
+			if (Environment.Version < new Version(4, 0, 30319)) {
+				MessageBox.Show("This version of SharpDevelop requires .NET 4.0. You are using: " + Environment.Version, "SharpDevelop");
 				return false;
 			}
 			return true;
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index 9dcc32f008..e1091fbe15 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -55,8 +55,9 @@
 		<Property Id="NETFRAMEWORK40FULLVERSION" Secure="yes">
 			<RegistrySearch Id="NetFramework40FullVersion" Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v4\Full" Name="Version" Type="raw" />
 		</Property>
-		<Condition Message="This setup requires the .NET 4.0 Full Framework RC to be installed.">
-			Installed OR (NETFRAMEWORK40FULL AND NETFRAMEWORK40FULLVERSION = "4.0.30128")
+		<!-- we could check NETFRAMEWORK40FULLVERSION optionally if we want to force the user to install a specific version -->
+		<Condition Message="This setup requires the .NET 4.0 Full Framework to be installed.">
+			Installed OR NETFRAMEWORK40FULL
 		</Condition>
 		
 		<!--
@@ -64,7 +65,7 @@
 			We only need the VC9 CRT, but unfortunately I couldn't find any way to detect if that is installed.
 			So instead, we conservatively check that the whole C++ runtime is installed.
 			However, we know that .NET 3.5 installs the C++ runtime parts we need (.NET 4.0 doesn't), so we'll check for
-			VCPP2008RUNTIME OR DOTNET35.
+			VCPP2008RUNTIME OR NETFRAMEWORK35.
  		-->
 		<Property Id="VCPP2008RUNTIME" Secure="yes">
 			<RegistrySearch Id="VCpp2008Runtime" Root="HKLM" Key="SOFTWARE\Microsoft\DevDiv\VC\Servicing\9.0" Name="SP" Type="raw" />