diff --git a/lib/DotNetOpenAuth.BuildTasks.dll b/lib/DotNetOpenAuth.BuildTasks.dll
index 7dcbcf2cab..5a35fa43dc 100644
Binary files a/lib/DotNetOpenAuth.BuildTasks.dll and b/lib/DotNetOpenAuth.BuildTasks.dll differ
diff --git a/lib/DotNetOpenAuth.BuildTasks.pdb b/lib/DotNetOpenAuth.BuildTasks.pdb
index 417bd244de..e7be47e025 100644
Binary files a/lib/DotNetOpenAuth.BuildTasks.pdb and b/lib/DotNetOpenAuth.BuildTasks.pdb differ
diff --git a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
index dbc8e60bdd..a144f1c89c 100644
--- a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
+++ b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
@@ -13,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\..\tools\DotNetOpenAuth.targets = ..\..\tools\DotNetOpenAuth.targets
 		..\..\tools\DotNetOpenAuth.Versioning.targets = ..\..\tools\DotNetOpenAuth.Versioning.targets
 		..\..\tools\drop.proj = ..\..\tools\drop.proj
+		..\..\EnlistmentInfo.props = ..\..\EnlistmentInfo.props
+		..\..\EnlistmentInfo.targets = ..\..\EnlistmentInfo.targets
 		..\..\tools\ohloh.proj = ..\..\tools\ohloh.proj
 		..\..\projecttemplates\projecttemplates.proj = ..\..\projecttemplates\projecttemplates.proj
 		..\..\samples\Samples.proj = ..\..\samples\Samples.proj
diff --git a/src/DotNetOpenAuth.BuildTasks/DowngradeProjects.cs b/src/DotNetOpenAuth.BuildTasks/DowngradeProjects.cs
index 645522dfbc..b545541c06 100644
--- a/src/DotNetOpenAuth.BuildTasks/DowngradeProjects.cs
+++ b/src/DotNetOpenAuth.BuildTasks/DowngradeProjects.cs
@@ -49,7 +49,11 @@ public class DowngradeProjects : Task {
 							}
 						}
 
-						// Web projects usually have an import that includes these substrings
+						// MSBuild v3.5 doesn't support the GetDirectoryNameOfFileAbove function
+						var enlistmentInfoImports = project.Imports.Cast<Import>().Where(i => i.ProjectPath.IndexOf("[MSBuild]::GetDirectoryNameOfFileAbove", StringComparison.OrdinalIgnoreCase) >= 0);
+						enlistmentInfoImports.ToList().ForEach(i => project.Imports.RemoveImport(i));
+
+						// Web projects usually have an import that includes these substrings));)
 						foreach (Import import in project.Imports) {
 							import.ProjectPath = import.ProjectPath
 								.Replace("$(MSBuildExtensionsPath32)", "$(MSBuildExtensionsPath)")