diff --git a/common.gypi b/common.gypi
index a7906d849097..658068d4deb5 100644
--- a/common.gypi
+++ b/common.gypi
@@ -1,7 +1,6 @@
 {
   'variables': {
     'clang': 0,
-    'python': 'python',
     'source_root': '<!(python tools/mac/source_root.py)',
     'conditions': [
       ['OS=="mac"', {
@@ -9,6 +8,23 @@
         'mac_sdk%': '<!(python tools/mac/find_sdk.py 10.8)',
       }],
     ],
+    # Reflects node's config.gypi.
+    'python': 'python',
+    'node_install_npm': 'false',
+    'node_prefix': '',
+    'node_shared_cares': 'false',
+    'node_shared_http_parser': 'false',
+    'node_shared_libuv': 'false',
+    'node_shared_openssl': 'false',
+    'node_shared_v8': 'true',
+    'node_shared_zlib': 'false',
+    'node_tag': '',
+    'node_unsafe_optimizations': 0,
+    'node_use_dtrace': 'false',
+    'node_use_etw': 'false',
+    'node_use_openssl': 'true',
+    'node_use_perfctr': 'false',
+    'node_use_systemtap': 'false',
   },
   # Settings to compile node under Windows.
   'target_defaults': {
@@ -38,6 +54,9 @@
             'WarnAsError': 'false',
           },
         },
+        'xcode_settings': {
+          'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO'
+        },
       }],
     ],
     'msvs_cygwin_shell': 0, # Strangely setting it to 1 would make building under cygwin fail.
diff --git a/script/bootstrap.py b/script/bootstrap.py
index 91cc7702178c..a90df1a2a84e 100755
--- a/script/bootstrap.py
+++ b/script/bootstrap.py
@@ -19,14 +19,14 @@ def main():
   os.chdir(SOURCE_ROOT)
 
   args = parse_args()
-  update_submodules()
-  bootstrap_brightray(args.url)
-
   if not args.skip_network:
+    update_submodules()
     update_node_modules()
+    bootstrap_brightray(args.url)
     if sys.platform == 'cygwin':
       update_win32_python()
 
+  touch_config_gypi()
   update_atom_shell()
 
 
@@ -68,6 +68,12 @@ def update_win32_python():
         subprocess.check_call(['git', 'pull', '--rebase'])
 
 
+def touch_config_gypi():
+  config_gypi = os.path.join(SOURCE_ROOT, 'vendor', 'node', 'config.gypi')
+  with open(config_gypi, 'w+') as f:
+    f.truncate(0)
+
+
 def update_atom_shell():
   update = os.path.join(SOURCE_ROOT, 'script', 'update.py')
   subprocess.check_call([sys.executable, update])
diff --git a/vendor/node b/vendor/node
index 83da26cac127..777ebae2717b 160000
--- a/vendor/node
+++ b/vendor/node
@@ -1 +1 @@
-Subproject commit 83da26cac127d985c05c5b5b6591d0a19cc30dad
+Subproject commit 777ebae2717ba49040e5fcff974294e3d4bd8106