diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CSharp-Mode.xshd b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CSharp-Mode.xshd
index a1ca9a0a66..a7655f0adb 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CSharp-Mode.xshd
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CSharp-Mode.xshd
@@ -165,6 +165,7 @@
 			<Word>on</Word>
 			<Word>equals</Word>
 			<Word>var</Word>
+			<Word>dynamic</Word>
 		</Keywords>
 		
 		<Keywords fontWeight="bold" foreground="Teal">
diff --git a/src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs b/src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs
index 64595d8c4e..7ad35bb869 100644
--- a/src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs
+++ b/src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs
@@ -163,7 +163,7 @@ namespace ICSharpCode.SharpDevelop.Project
 			FileName = information.OutputProjectFileName;
 			
 			project.FullFileName = information.OutputProjectFileName;
-			project.DefaultToolsVersion = "3.5";
+			project.DefaultToolsVersion = "4.0";
 			
 			base.IdGuid = "{" + Guid.NewGuid().ToString().ToUpperInvariant() + "}";
 			MSBuild.BuildPropertyGroup group = project.AddNewPropertyGroup(false);
diff --git a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config
index 91174506c0..5c14c1929e 100644
--- a/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config
+++ b/src/Main/ICSharpCode.SharpDevelop.BuildWorker/app.config
@@ -6,9 +6,13 @@
 				<assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
 				<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="4.0.0.0"/>
 			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Build.Engine" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+				<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="4.0.0.0"/>
+			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.CompactFramework.Build.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="9.0.0.0"/>
+				<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="10.0.0.0"/>
 			</dependentAssembly>
 		</assemblyBinding>
 	</runtime>
diff --git a/src/Main/StartUp/Project/app.template.config b/src/Main/StartUp/Project/app.template.config
index fee1ff0aca..0b1aab563c 100644
--- a/src/Main/StartUp/Project/app.template.config
+++ b/src/Main/StartUp/Project/app.template.config
@@ -59,9 +59,13 @@
 				<assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
 				<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="4.0.0.0"/>
 			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Build.Engine" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+				<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="4.0.0.0"/>
+			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.CompactFramework.Build.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="9.0.0.0"/>
+				<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="10.0.0.0"/>
 			</dependentAssembly>
 			
 			<probing privatePath="Tools\NUnit"/>