diff --git a/Gruntfile.js b/Gruntfile.js
index e3fb67bf7..ce3fea580 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -71,7 +71,7 @@ module.exports = function (grunt) {
             },
             "node-mac": {
                 "dest"      : "<%= downloads %>",
-                "src"       : "http://nodejs.org/dist/v<%= node.version %>/node-v<%= node.version %>-darwin-x86.tar.gz"
+                "src"       : "http://nodejs.org/dist/v<%= node.version %>/node-v<%= node.version %>-darwin-x64.tar.gz"
             },
             /* win */
             "cef-win": {
@@ -84,8 +84,9 @@ module.exports = function (grunt) {
             },
             "node-win": {
                 "dest"      : "<%= downloads %>",
-                "src"       : ["http://nodejs.org/dist/v<%= node.version %>/node.exe",
-                               "http://nodejs.org/dist/npm/npm-<%= npm.version %>.zip"]
+                "src"       : process.arch === "x64" ?
+                                "http://nodejs.org/dist/v<%= node.version %>/win-x64/node.exe" :
+                                "http://nodejs.org/dist/v<%= node.version %>/win-x86/node.exe"
             }
         },
         "clean": {
@@ -227,10 +228,7 @@ module.exports = function (grunt) {
             "version"       : "3.2623.1397"
         },
         "node": {
-            "version"       : "0.10.24"
-        },
-        "npm": {
-            "version"       : "1.2.11"
+            "version"       : "6.3.1"
         }
     });
 
diff --git a/tasks/setup.js b/tasks/setup.js
index 54c156622..b16ceb2fe 100644
--- a/tasks/setup.js
+++ b/tasks/setup.js
@@ -375,24 +375,15 @@ module.exports = function (grunt) {
         // requires node to set "nodeSrc" in config
         grunt.task.requires(["node"]);
 
-        var done        = this.async(),
-            nodeDest    = grunt.config("nodeDest"),
-            exeFile     = nodeDest[0],
-            npmFile     = nodeDest[1];
+        var nodeDest    = grunt.config("nodeDest"),
+            exeFile     = nodeDest;
 
         grunt.file.mkdir("deps/node");
 
         // copy node.exe to Brackets-node
         grunt.file.copy(exeFile,  "deps/node/node.exe");
 
-        // unzip NPM
-        unzip(npmFile, "deps/node").then(function () {
-            nodeWriteVersion();
-            done();
-        }, function (err) {
-            grunt.log.error(err);
-            done(false);
-        });
+        nodeWriteVersion();
     });
 
     // task: node-mac