diff --git a/build/Build.proj b/build/Build.proj
index 6265cdf33b..134bb668ed 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -239,7 +239,7 @@
   </Target>
 
   <!-- Copy the xml documentation to the bin folder -->
-  <Target Name="CopyXmlDocumentation"  DependsOnTargets="CompileProjects">
+  <Target Name="CopyXmlDocumentation"  DependsOnTargets="CleanupPresentation">
     <ItemGroup>
       <XmlDocumentationFiles Include="$(SolutionBinFolder)*.xml" />
     </ItemGroup>
@@ -251,6 +251,17 @@
     <Message Text="CopyXmlDocumentation" />
   </Target>
 
+  <!-- Unlike 2010, the VS2012 build targets file doesn't clean up the umbraco.presentation dir, do it manually -->
+  <!-- Also, it places umbraco.XmlSerializers.dll in the root, even though it's also in the bin folder. Kill! -->
+  <Target Name="CleanupPresentation" DependsOnTargets="CompileProjects">
+	<ItemGroup>
+		<PresentationFolderToDelete Include="$(WebAppFolder)umbraco.presentation" />
+		<XmlSerializersDll Include="$(WebAppFolder)umbraco.XmlSerializers.dll" />
+    </ItemGroup>
+	<RemoveDir Directories="@(PresentationFolderToDelete)" />
+    <Delete Files="@(XmlSerializersDll)" />
+  </Target>
+
   <Target Name="CompileProjects" DependsOnTargets="CompileExternalExamineProjects">
     
     <Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
diff --git a/src/umbraco.presentation.targets b/src/umbraco.presentation.targets
index b00c06e274..79eb7c494d 100644
--- a/src/umbraco.presentation.targets
+++ b/src/umbraco.presentation.targets
@@ -8,7 +8,7 @@
   -->
   
   <PropertyGroup Condition="$(BuildingInsideVisualStudio) != true">
-    <SolutionRootFolder>$(ProjectDir)..\</SolutionRootFolder>
+    <SolutionRootFolder>$(MSBuildStartupDirectory)\..\src\</SolutionRootFolder>
     <ConfigEnvironment></ConfigEnvironment>
   </PropertyGroup>