diff --git a/DEPS b/DEPS
index 029e9db03943..19fcb02031e8 100644
--- a/DEPS
+++ b/DEPS
@@ -65,6 +65,33 @@ hooks = [
     'pattern': 'src/electron/package.json',
     'name': 'electron_npm_deps'
   },
+  {
+    'action': [
+      'python',
+      '-c',
+      'import os; os.chdir("src"); os.chdir("electron"); os.system("git submodule update --init --recursive");',
+    ],
+    'pattern': 'src/electron',
+    'name': 'electron_submodules'
+  },
+  {
+    'action': [
+      'python',
+      '-c',
+      'import os; os.chdir("src"); os.chdir("electron"); os.chdir("vendor"); os.chdir("boto"); os.system("python setup.py build");',
+    ],
+    'pattern': 'src/electron',
+    'name': 'setup_boto',
+  },
+  {
+    'action': [
+      'python',
+      '-c',
+      'import os; os.chdir("src"); os.chdir("electron"); os.chdir("vendor"); os.chdir("requests"); os.system("python setup.py build");',
+    ],
+    'pattern': 'src/electron',
+    'name': 'setup_requests',
+  }
 ]
 
 recursedeps = [
diff --git a/script/upload-node-headers.py b/script/upload-node-headers.py
index f4c4a26b2acc..a431e826aed7 100755
--- a/script/upload-node-headers.py
+++ b/script/upload-node-headers.py
@@ -14,6 +14,14 @@ from lib.util import safe_mkdir, scoped_cwd, s3put, get_out_dir, get_dist_dir
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 DIST_DIR    = get_dist_dir()
 OUT_DIR     = get_out_dir()
+GEN_DIR     = os.path.join(OUT_DIR, 'gen')
+
+HEADER_TAR_NAMES = [
+  'node-{0}.tar.gz',
+  'node-{0}-headers.tar.gz',
+  'iojs-{0}.tar.gz',
+  'iojs-{0}-headers.tar.gz'
+]
 
 def main():
   args = parse_args()
@@ -31,11 +39,15 @@ def parse_args():
 
 
 def upload_node(bucket, access_key, secret_key, version):
-  safe_mkdir(DIST_DIR)
-  with scoped_cwd(DIST_DIR):
-    s3put(bucket, access_key, secret_key, DIST_DIR,
+  with scoped_cwd(GEN_DIR):
+    generated_tar = os.path.join(GEN_DIR, 'node_headers.tar.gz')
+    for header_tar in HEADER_TAR_NAMES:
+      versioned_header_tar = header_tar.format(version)
+      shutil.copy2(generated_tar, os.path.join(GEN_DIR, versioned_header_tar))
+
+    s3put(bucket, access_key, secret_key, GEN_DIR,
           'atom-shell/dist/{0}'.format(version), glob.glob('node-*.tar.gz'))
-    s3put(bucket, access_key, secret_key, DIST_DIR,
+    s3put(bucket, access_key, secret_key, GEN_DIR,
           'atom-shell/dist/{0}'.format(version), glob.glob('iojs-*.tar.gz'))
 
   if PLATFORM == 'win32':