diff --git a/build.cmd b/build.cmd
index dbec262472..1875618091 100644
--- a/build.cmd
+++ b/build.cmd
@@ -15,5 +15,5 @@ md .nuget
 copy %CACHED_NUGET% .nuget\nuget.exe > nul
 
 :build
-.nuget\nuget.exe install Sake -version 0.2 -o packages
-packages\Sake.0.2\tools\Sake.exe -I build -f makefile.shade %*
+.nuget\nuget.exe install Sake -version 0.2.2 -o packages -ExcludeVersion
+packages\Sake\tools\Sake.exe -I build -f makefile.shade %*
diff --git a/build/BuildEnv.shade b/build/BuildEnv.shade
index 0c29b03f52..81d7d716c5 100644
--- a/build/BuildEnv.shade
+++ b/build/BuildEnv.shade
@@ -26,13 +26,6 @@ functions
             return "t" + DateTime.UtcNow.ToString("yyMMddHHmmss");
         }
     }
-    bool IsTeamCity
-    {
-        get
-        {
-            return Environment.GetEnvironmentVariable("TEAMCITY_PROJECT_NAME") != null;
-        }
-    }
     
     bool IsBuildV2
     {
diff --git a/build/_k-standard-goals.shade b/build/_k-standard-goals.shade
index c727e6e38a..2572ad7667 100644
--- a/build/_k-standard-goals.shade
+++ b/build/_k-standard-goals.shade
@@ -6,6 +6,7 @@ use namespace="System.Linq"
 use import="Files"
 use import="BuildEnv"
 use import="Environment"
+use-teamcity
 
 default BASE_DIR='${Directory.GetCurrentDirectory()}'
 default TARGET_DIR='${Path.Combine(BASE_DIR, "artifacts")}'
diff --git a/makefile.shade b/makefile.shade
index b0e492e57a..c8fda39f4f 100644
--- a/makefile.shade
+++ b/makefile.shade
@@ -2,6 +2,7 @@
 var PROJECT='AspNet'
 var VERSION='0.2.1'
 
+use-teamcity
 use namespace='System'
 use namespace='System.IO'
 use namespace='System.Collections.Generic'