diff --git a/build.cmd b/build.cmd
index 903d532df3..7987edb77d 100644
--- a/build.cmd
+++ b/build.cmd
@@ -23,4 +23,4 @@ CALL packages\KoreBuild\build\kvm install default -svrc50 -x86
 
 :run
 CALL packages\KoreBuild\build\kvm use default -svr50 -x86
-packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
+packages\Sake\tools\Sake.exe -I build -I packages\KoreBuild\build -f makefile.shade %*
diff --git a/build/_custom-goals.shade b/build/_custom-goals.shade
new file mode 100644
index 0000000000..f05bf30713
--- /dev/null
+++ b/build/_custom-goals.shade
@@ -0,0 +1,15 @@
+use assembly="System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
+use assembly="System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
+use namespace="System.IO"
+use namespace="System.IO.Compression"
+use namespace="System.Net"
+
+#add-files target="compile"
+  var each='var nupkgFile in Files.Include("artifacts\\build\\Microsoft.AspNet.Server.Kestrel.*.nupkg").Where(x=>!x.EndsWith("symbols.nupkg"))'
+    log info='Adding content to ${nupkgFile}'
+    var archive='${ZipFile.Open(nupkgFile, ZipArchiveMode.Update)}'
+    @{
+        archive.CreateEntryFromFile("src/Microsoft.AspNet.Server.Kestrel/amd64/libuv.dll", "amd64/libuv.dll");
+        archive.CreateEntryFromFile("src/Microsoft.AspNet.Server.Kestrel/x86/libuv.dll", "x86/libuv.dll");
+        archive.Dispose();
+    }
diff --git a/makefile.shade b/makefile.shade
index 6357ea2841..0fad94bacc 100644
--- a/makefile.shade
+++ b/makefile.shade
@@ -5,3 +5,4 @@ var AUTHORS='Microsoft'
 
 use-standard-lifecycle
 k-standard-goals
+custom-goals