diff --git a/build.fsx b/build.fsx
index 1df35655bc4..c32dab7ffe9 100644
--- a/build.fsx
+++ b/build.fsx
@@ -688,6 +688,30 @@ Target "CreateNuGet" (fun _ ->
         NuGet (setParams >> x64ify) "fake.nuspec"
 )
 
+Target "CreateChocolateyPackage" (fun _ ->
+    let nugetToolsDir = nugetLegacyDir @@ "tools"
+    CleanDir nugetToolsDir
+    !! (buildDir @@ "**/*.*") |> Copy nugetToolsDir
+
+    ensureDirectory "nuget/legacy/chocolatey"
+    Choco.PackFromTemplate (fun p ->
+        { p with
+            PackageId = "fake"
+            ReleaseNotes = release.Notes |> toLines
+            InstallerType = Choco.ChocolateyInstallerType.SelfContained
+            Version = release.NugetVersion
+            Files = [ (System.IO.Path.GetFullPath @"nuget\legacy\tools") + @"\**", Some "tools", None ]
+            OutputDir = "nuget/legacy/chocolatey" }) "src/Fake-choco-template.nuspec"
+    ()
+)
+Target "PushChocolateyPackage" (fun _ ->
+    let path = sprintf "nuget/legacy/chocolatey/%s.%s.nupkg" "fake" release.NugetVersion
+    path |> Choco.Push (fun p ->
+        { p with
+            Source = "https://push.chocolatey.org/"
+            ApiKey = environVarOrFail "CHOCOLATEY_API_KEY" })
+)
+
 #if !DOTNETCORE
 #load "src/app/Fake.DotNet.Cli/Dotnet.fs"
 open Fake.DotNet.Cli
@@ -854,27 +878,6 @@ Target "DotnetCoreCreateZipPackages" (fun _ ->
     )
 )
 
-Target "DotnetCoreCreateChocolateyPackage" (fun _ ->
-    // !! ""
-    ensureDirectory "nuget/dotnetcore/chocolatey"
-    Choco.PackFromTemplate (fun p ->
-        { p with
-            PackageId = "fake"
-            ReleaseNotes = release.Notes |> toLines
-            InstallerType = Choco.ChocolateyInstallerType.SelfContained
-            Version = release.NugetVersion
-            Files = [ (System.IO.Path.GetFullPath @"nuget\dotnetcore\Fake.netcore\win7-x86") + @"\**", Some "bin", None ]
-            OutputDir = "nuget/dotnetcore/chocolatey" }) "src/Fake-choco-template.nuspec"
-    ()
-)
-Target "DotnetCorePushChocolateyPackage" (fun _ ->
-    let path = sprintf "nuget/dotnetcore/chocolatey/%s.%s.nupkg" "fake" release.NugetVersion
-    path |> Choco.Push (fun p ->
-        { p with
-            Source = "https://push.chocolatey.org/"
-            ApiKey = environVarOrFail "CHOCOLATEY_API_KEY" })
-)
-
 let executeFPM args =
     printfn "%s %s" "fpm" args
     Shell.Exec("fpm", args=args, dir="bin")
@@ -1047,11 +1050,11 @@ Target "StartDnc" DoNothing
     =?> ("SourceLink", isLocalBuild && not isLinux)
     =?> ("CreateNuGet", not isLinux)
     ==> "CopyLicense"
-    =?> ("DotnetCoreCreateChocolateyPackage", not isLinux)
+    =?> ("CreateChocolateyPackage", not isLinux)
     ==> "Default"
     =?> ("GenerateDocs", isLocalBuild && not isLinux)
     ==> "EnsureTestsRun"
-    =?> ("DotnetCorePushChocolateyPackage", not isLinux)
+    =?> ("PushChocolateyPackage", not isLinux)
     =?> ("ReleaseDocs", isLocalBuild && not isLinux)
     ==> "DotnetCorePushNuGet"
     ==> "PublishNuget"
diff --git a/src/Fake-choco-template.nuspec b/src/Fake-choco-template.nuspec
index 075297e2006..c62bb9a92f0 100644
--- a/src/Fake-choco-template.nuspec
+++ b/src/Fake-choco-template.nuspec
@@ -26,5 +26,5 @@ If you need more than the default functionality you can either write F# or simpl
     @dependencies@
   </metadata>
   @files@
-    <!--<file src="..\nuget\dotnetcore\Fake.netcore\win7-x86\**" target="bin" />-->
+    <!--<file src="..\nuget\legacy\tools\**" target="tools" />-->
 </package>