diff --git a/.gitmodules b/.gitmodules
index 309817eb7..04408d909 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -88,3 +88,6 @@
 [submodule "vendor/packages/hyperlink-helper.tmbundle"]
 	path = vendor/packages/hyperlink-helper.tmbundle
 	url = https://github.com/textmate/hyperlink-helper.tmbundle
+[submodule "vendor/apm"]
+	path = vendor/apm
+	url = https://github.com/atom/apm.git
diff --git a/script/bootstrap b/script/bootstrap
index 023f52c80..9e1a9a781 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -21,15 +21,10 @@ exit_unless_npm_exists() {
 exit_unless_xcode_exists
 exit_unless_npm_exists
 
-npm install npm --silent
-
-NODE_DIR="$HOME/.cefode-gyp"
-NODE_VERSION="0.10.3"
-NODE_URL="https://gh-contractor-zcbenz.s3.amazonaws.com/cefode2/dist"
-if [ ! -d "node_modules/node-gyp" ]; then
-  ./node_modules/.bin/npm install node-gyp --silent
-  HOME="$NODE_DIR" ./node_modules/.bin/node-gyp install --target="$NODE_VERSION" --dist-url="$NODE_URL" --arch=ia32
-fi
-HOME="$NODE_DIR" ./node_modules/.bin/npm install --target="$NODE_VERSION" --arch=ia32 --silent
 git submodule --quiet sync
 git submodule --quiet update --recursive --init
+
+(cd vendor/apm && npm install .)
+
+npm install vendor/apm
+./node_modules/.bin/apm install
diff --git a/vendor/apm b/vendor/apm
new file mode 160000
index 000000000..2c7ffb2e3
--- /dev/null
+++ b/vendor/apm
@@ -0,0 +1 @@
+Subproject commit 2c7ffb2e37ff92514b1471e9d9d325f4d3a52b11