diff --git a/ClickToBuild.cmd b/ClickToBuild.cmd
index e07b3675a..a98d3f4f3 100644
--- a/ClickToBuild.cmd
+++ b/ClickToBuild.cmd
@@ -27,7 +27,10 @@ SET project=%2
 IF "%target%" == "" SET target=Build
 IF "%project%" =="" SET project=Orchard.proj
 
-nuget.exe restore .\src\Orchard.sln
+lib\nuget\nuget.exe restore .\src\Orchard.sln
+lib\nuget\nuget.exe install SlowCheetah -e -o build\libs
+lib\nuget\nuget.exe install MSBuildTasks -e -o build\libs
+
 msbuild /t:%target% %project%
 
 pause
diff --git a/Orchard.proj b/Orchard.proj
index ce5678a81..9d8afd6e3 100644
--- a/Orchard.proj
+++ b/Orchard.proj
@@ -34,6 +34,7 @@
   </PropertyGroup>
 
   <Import Project="$(BuildFolder)\libs\MSBuildTasks\tools\MSBuild.Community.Tasks.Targets"/>
+  <Import Project="$(BuildFolder)\libs\SlowCheetah\tools\SlowCheetah.Transforms.targets"/>
 
   <!-- Coordinating Targets -->
 
@@ -111,12 +112,6 @@
     <RemoveDir Directories="$(ArtifactsFolder)" />
   </Target>
   
-  <!-- Restore necessary tooling -->
-  <Target Name="RestoreTooling">
-      <Exec Command="$(LibFolder)\nuget\nuget.exe install SlowCheetah -e -o $(BuildFolder)\libs" WorkingDirectory="$(MSBuildProjectDirectory)"/>
-      <Exec Command="$(LibFolder)\nuget\nuget.exe install MSBuildTasks -e -o $(BuildFolder)\libs" WorkingDirectory="$(MSBuildProjectDirectory)"/>
-  </Target>
-
   <Target Name="Compile" DependsOnTargets="RestoreTooling">
     <!-- Compile to "OutputFolder" -->
     <MSBuild