diff --git a/build.fsx b/build.fsx
index febedb45..1a9f7b0f 100644
--- a/build.fsx
+++ b/build.fsx
@@ -454,7 +454,7 @@ Target "DataZip" (fun _ ->
 // NUGET
 
 let updateNuspec (pack:Package) outPath symbols updateFiles spec =
-    { spec with ToolPath = "tools/NuGet/NuGet.exe"
+    { spec with ToolPath = "packages/NuGet.CommandLine/tools/NuGet.exe"
                 OutputPath = outPath
                 WorkingDir = "obj/NuGet"
                 Version = pack.Version
@@ -599,7 +599,7 @@ let publishNuGet packageFiles =
             let args = sprintf "push \"%s\"" (FullName file)
             let result =
                 ExecProcess (fun info ->
-                    info.FileName <- "tools/NuGet/NuGet.exe"
+                    info.FileName <- "packages/NuGet.CommandLine/tools/NuGet.exe"
                     info.WorkingDirectory <- FullName "obj/NuGet"
                     info.Arguments <- args) (TimeSpan.FromMinutes 10.)
             if result <> 0 then failwith "Error during NuGet push."
diff --git a/paket.dependencies b/paket.dependencies
index 604ff287..2b530598 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -1,16 +1,23 @@
 source http://nuget.org/api/v2
 
+# Core Dependencies
 nuget FSharp.Core.Microsoft.Signed ~> 3.1.1
 nuget FSharp.Core.4.3.0.0.Microsoft.Signed ~> 3.0.0
 nuget TaskParallelLibrary 1.0.2856.0
 
-nuget FAKE ~> 3.5
-nuget NUnit.Runners ~> 2.6
-nuget FSharp.Formatting !~> 2.4
-nuget NUnit ~> 2.6
-nuget FsUnit ~> 1.3
-
+# Data Dependencies
 nuget MathNet.Numerics 3.0.0
 
+# Benchmark Dependencies
 nuget BenchShark 1.0.0
 nuget ConsoleDump 0.6.0.1
+
+# Development Dependencies
+nuget NUnit ~> 2.6
+nuget FsUnit ~> 1.3
+
+# Tools
+nuget FAKE ~> 3.5
+nuget NUnit.Runners ~> 2.6
+nuget FSharp.Formatting !~> 2.4
+nuget NuGet.CommandLine
diff --git a/paket.lock b/paket.lock
index f5d8c117..d71eea1b 100644
--- a/paket.lock
+++ b/paket.lock
@@ -15,6 +15,7 @@ NUGET
       NUnit (>= 2.6.3)
     MathNet.Numerics (3.0.0)
     Microsoft.AspNet.Razor (2.0.30506.0)
+    NuGet.CommandLine (2.8.2)
     NUnit (2.6.3)
     NUnit.Runners (2.6.3)
     RazorEngine (3.3.0)
diff --git a/tools/NuGet/NuGet.exe b/tools/NuGet/NuGet.exe
deleted file mode 100644
index c41a0d0d..00000000
Binary files a/tools/NuGet/NuGet.exe and /dev/null differ