diff --git a/Octokit.nuspec b/Octokit.nuspec
index 9b76efb7..e5312e48 100644
--- a/Octokit.nuspec
+++ b/Octokit.nuspec
@@ -1,17 +1,19 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>Octokit</id>
-    <version>0.1.1</version>
-    <authors>GitHub</authors>
-    <owners>GitHub</owners>
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">    
+    <id>@project@</id>
+    <version>@build.number@</version>
+    <authors>@authors@</authors>
+    <owners>@authors@</owners>
+    <summary>@summary@</summary>
     <licenseUrl>https://github.com/octokit/octokit.net/blob/master/LICENSE.txt</licenseUrl>
     <projectUrl>https://github.com/octokit/octokit.net</projectUrl>
     <iconUrl>https://f.cloud.github.com/assets/19977/1441274/160fba8c-41a9-11e3-831d-61d88fa886f4.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>An async-based GitHub API client library for .NET</description>
+    <description>@description@</description>
     <releaseNotes>Initial release.</releaseNotes>
-    <copyright>Copyright GitHub 2013</copyright>
+    <copyright>Copyright GitHub 2013</copyright>    
     <tags>GitHub API Octokit</tags>
+    @dependencies@
   </metadata>
 </package>
\ No newline at end of file
diff --git a/build.fsx b/build.fsx
index f502b9a5..a81cee45 100644
--- a/build.fsx
+++ b/build.fsx
@@ -1,6 +1,11 @@
 #r @"tools\FAKE.Core\tools\FakeLib.dll"
 open Fake 
 
+let projectName = "Octokit"
+let authors = ["GitHub"]
+let projectDescription = "An async-based GitHub API client library for .NET"
+let projectSummary = projectDescription // TODO: write a summary
+
 let buildDir = "./Octokit/bin"
 let reactiveBuildDir = "./Octokit.Reactive/bin"
 let packageDir = "./packaging/octokit/"
@@ -23,6 +28,17 @@ Target "CreateOctokitPackage" (fun _ ->
     CopyFile net45Dir (buildDir @@ "Release/Net40/Octokit.dll") // TODO: this a bug in the sln?!
     CopyFile netcore45Dir (buildDir @@ "Release/NetCore45/Octokit.dll")
     CopyFiles packageDir ["LICENSE.txt"; "README.md"]
+
+    NuGet (fun p -> 
+        {p with
+            Authors = authors
+            Project = projectName
+            Description = projectDescription                               
+            OutputPath = "./packaging/"
+            Summary = projectSummary
+            WorkingDir = packageDir
+            AccessKey = getBuildParamOrDefault "nugetkey" ""
+            Publish = hasBuildParam "nugetkey" }) "octokit.nuspec"
 )
 
 Target "CreateOctokitReactivePackage" (fun _ ->