diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 63f7918293..10d8bf70af 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,15 +23,6 @@ $ make watch-core
 This will compile Babel and then sit in the background and on file modification
 recompile the necessary files.
 
-It's also recommended that you `npm link` the Babel packages:
-
-```sh
-$ cd babel
-$ npm link
-$ cd packages/babel-cli
-$ npm link
-```
-
 #### Running tests
 
 You can run tests via:
diff --git a/Makefile b/Makefile
index db28c89b4c..2979397cb6 100644
--- a/Makefile
+++ b/Makefile
@@ -110,6 +110,8 @@ publish-cli:
 
 bootstrap:
 	npm install
+	npm link
+	cd packages/babel-cli && npm install && npm link
 	git submodule update --init
 	cd vendor/regenerator && npm install
 	cd vendor/compat-table && npm install object-assign