diff --git a/.gitmodules b/.gitmodules
index eef6c657dc6..74736fd87d2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "vendor/brightray"]
 	path = vendor/brightray
-	url = git@github.com:aroben/brightray.git
+  url = https://github.com/aroben/brightray.git
+[submodule "vendor/node"]
+	path = vendor/node
+  url = https://github.com/atom/cefode-node.git
diff --git a/atom.gyp b/atom.gyp
index 483c32b8d5d..505c0c59c05 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -30,6 +30,9 @@
       'app/atom_library_main.h',
     ],
   },
+  'includes': [
+    'vendor/brightray/brightray.gypi'
+  ],
   'targets': [
     {
       'target_name': '<(project_name)',
@@ -93,6 +96,7 @@
       'type': 'static_library',
       'dependencies': [
         'vendor/brightray/brightray.gyp:brightray',
+        'vendor/node/node.gyp:node',
       ],
       'sources': [
         '<@(lib_sources)',
diff --git a/script/update b/script/update
index e7cc0ceabaa..503fb6374f9 100755
--- a/script/update
+++ b/script/update
@@ -4,4 +4,7 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-gyp --depth . atom.gyp -I vendor/brightray/brightray.gypi
+gyp --depth . atom.gyp \
+  -Ivendor/brightray/brightray.gypi \
+  -Dtarget_arch=ia32 \
+  -Dlibrary=static_library
diff --git a/vendor/node b/vendor/node
new file mode 160000
index 00000000000..732fcb812d0
--- /dev/null
+++ b/vendor/node
@@ -0,0 +1 @@
+Subproject commit 732fcb812d0e47429d902c922c07ddb86b842d1d