diff --git a/.gitignore b/.gitignore
index aa94efd498e..f764f5e3cd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -217,8 +217,6 @@ FakesAssemblies/
 /src/.Akka.boltdata/TestResults.json
 resetdev.bat
 /src/packages/repositories.config
-/src/.nuget
-/src/.nuget/NuGet.exe
 
 # FAKE build folder
 .fake/
diff --git a/build.cmd b/build.cmd
index de9922b9747..abf65d45ecc 100644
--- a/build.cmd
+++ b/build.cmd
@@ -8,7 +8,7 @@ SET CACHED_NUGET=%LocalAppData%\NuGet\NuGet.exe
 IF EXIST %CACHED_NUGET% goto copynuget
 echo Downloading latest version of NuGet.exe...
 IF NOT EXIST %LocalAppData%\NuGet md %LocalAppData%\NuGet
-@powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://www.nuget.org/nuget.exe' -OutFile '%CACHED_NUGET%'"
+@powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://dist.nuget.org/win-x86-commandline/v4.1.0/nuget.exe' -OutFile '%CACHED_NUGET%'"
 
 :copynuget
 IF EXIST src\.nuget\nuget.exe goto restore
@@ -17,13 +17,8 @@ copy %CACHED_NUGET% src\.nuget\nuget.exe > nul
 
 :restore
 
-src\.nuget\NuGet.exe update -self
-
-
 pushd %~dp0
 
-src\.nuget\NuGet.exe update -self
-
 src\.nuget\NuGet.exe install FAKE -ConfigFile src\.nuget\Nuget.Config -OutputDirectory src\packages -ExcludeVersion -Version 4.16.1
 
 src\.nuget\NuGet.exe install NUnit.Console -ConfigFile src\.nuget\Nuget.Config -OutputDirectory src\packages\FAKE -ExcludeVersion -Version 3.2.1
diff --git a/build.sh b/build.sh
index 9a9171c024d..99a99a75ea6 100755
--- a/build.sh
+++ b/build.sh
@@ -10,12 +10,9 @@ popd  > /dev/null
 
 if ! [ -f $SCRIPT_PATH/src/.nuget/nuget.exe ] 
     then
-        wget "https://www.nuget.org/nuget.exe" -P $SCRIPT_PATH/src/.nuget/
+        wget "https://dist.nuget.org/win-x86-commandline/v4.1.0/nuget.exe" -P $SCRIPT_PATH/src/.nuget/
 fi
 
-mono $SCRIPT_PATH/src/.nuget/nuget.exe update -self
-
-
 SCRIPT_PATH="${BASH_SOURCE[0]}";
 if ([ -h "${SCRIPT_PATH}" ]) then
   while([ -h "${SCRIPT_PATH}" ]) do SCRIPT_PATH=`readlink "${SCRIPT_PATH}"`; done
@@ -25,8 +22,6 @@ cd `dirname ${SCRIPT_PATH}` > /dev/null
 SCRIPT_PATH=`pwd`;
 popd  > /dev/null
 
-mono $SCRIPT_PATH/src/.nuget/nuget.exe update -self
-
 mono $SCRIPT_PATH/src/.nuget/nuget.exe install FAKE -OutputDirectory $SCRIPT_PATH/src/packages -ExcludeVersion -Version 4.61.3
 
 mono $SCRIPT_PATH/src/.nuget/nuget.exe install xunit.runner.console -OutputDirectory $SCRIPT_PATH/src/packages/FAKE -ExcludeVersion -Version 2.0.0
diff --git a/src/.nuget/nuget.exe b/src/.nuget/nuget.exe
new file mode 100644
index 00000000000..856263ded82
Binary files /dev/null and b/src/.nuget/nuget.exe differ