diff --git a/.npmignore b/.npmignore
index 2f9f95aaf7..cbb7790fb4 100644
--- a/.npmignore
+++ b/.npmignore
@@ -2,3 +2,4 @@ src
 test
 *.log
 scripts
+lib
diff --git a/bin/babylon.js b/bin/babylon.js
index ddda000631..db5d8bc96d 100755
--- a/bin/babylon.js
+++ b/bin/babylon.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-var babylon = require("../lib/index");
+var babylon = require("..");
 var fs      = require("fs");
 
 var filename = process.argv[2];
diff --git a/scripts/_util.js b/scripts/_util.js
new file mode 100644
index 0000000000..74da881da0
--- /dev/null
+++ b/scripts/_util.js
@@ -0,0 +1,7 @@
+var fs = require("fs");
+
+exports.updateMain = function (main) {
+  var pkg = require("../package.json");
+  pkg.main = main;
+  fs.writeFileSync(__dirname + "/../package.json", JSON.stringify(pkg, null, "  "));
+};
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
deleted file mode 100755
index 155282ce9b..0000000000
--- a/scripts/bootstrap.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-set -e
-cd ../babel
-npm link babylon
diff --git a/scripts/postpublish.js b/scripts/postpublish.js
new file mode 100644
index 0000000000..0c6f9bbd74
--- /dev/null
+++ b/scripts/postpublish.js
@@ -0,0 +1,2 @@
+require("./_util").updateMain("lib/index.js");
+require("fs").unlinkSync(__dirname + "/../index.js");
diff --git a/scripts/prepublish.js b/scripts/prepublish.js
new file mode 100644
index 0000000000..ade8195a02
--- /dev/null
+++ b/scripts/prepublish.js
@@ -0,0 +1,2 @@
+require("./_util").updateMain("index.js");
+require("child_process").execSync(__dirname + "/../../../node_modules/.bin/browserify -s babylon -e " + __dirname + "/../lib/index.js -o " + __dirname + "/../index.js", { encoding: "utf8" });