diff --git a/VERSION b/VERSION
index 694a2b5eb3..aaeac54d59 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.8.22
\ No newline at end of file
+5.8.23
\ No newline at end of file
diff --git a/packages/babel-cli/package.json b/packages/babel-cli/package.json
index df57a1005a..00ed33de06 100644
--- a/packages/babel-cli/package.json
+++ b/packages/babel-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel",
-  "version": "5.8.21",
+  "version": "5.8.23",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
diff --git a/packages/babel/scripts/build-dist.sh b/packages/babel/scripts/build-dist.sh
deleted file mode 100755
index b43bf42f56..0000000000
--- a/packages/babel/scripts/build-dist.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-set -e
-
-BROWSERIFY_CMD="../../node_modules/browserify/bin/cmd.js"
-UGLIFY_CMD="../../node_modules/uglify-js/bin/uglifyjs"
-BROWSERIFY_IGNORE="-i esprima-fb"
-
-mkdir -p dist
-
-node scripts/cache-templates
-
-node $BROWSERIFY_CMD -e lib/polyfill.js >dist/polyfill.js
-node $UGLIFY_CMD dist/polyfill.js >dist/polyfill.min.js
-
-# Add a Unicode BOM so browsers will interpret the file as UTF-8
-node -p '"\uFEFF"' > dist/browser.js
-node $BROWSERIFY_CMD lib/api/browser.js -s babel $BROWSERIFY_IGNORE >>dist/browser.js
-node -p '"\uFEFF"' > dist/browser.min.js
-node $UGLIFY_CMD dist/browser.js >>dist/browser.min.js
-
-node $BROWSERIFY_CMD lib/api/node.js --node $BROWSERIFY_IGNORE >dist/node.js
-
-node ../babel-cli/lib/babel-external-helpers >dist/external-helpers.js
-node $UGLIFY_CMD dist/external-helpers.js >dist/external-helpers.min.js
-
-rm -rf templates.json
diff --git a/packages/babylon/package.json b/packages/babylon/package.json
index 0da5690336..32b7162915 100644
--- a/packages/babylon/package.json
+++ b/packages/babylon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babylon",
-  "version": "5.8.22",
+  "version": "5.8.23",
   "description": "",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
diff --git a/scripts/bootstrap.js b/scripts/bootstrap.js
index 92aee9806f..98aed8874b 100755
--- a/scripts/bootstrap.js
+++ b/scripts/bootstrap.js
@@ -10,14 +10,17 @@ exec("npm list --global --depth 1 babel >/dev/null 2>&1 && npm uninstall -g babe
 var packages = [];
 ls("packages/*").forEach(function (loc) {
   var name = path.basename(loc);
-  if (name[0] !== ".") {
-    var pkg = require("../packages/" + name + "/package.json");
-    packages.push({
-      folder: name,
-      pkg: pkg,
-      name: pkg.name
-    });
-  }
+  if (name[0] === ".") return;
+
+  var pkgLoc = __dirname + "/../packages/" + name + "/package.json";
+  if (!fs.existsSync(pkgLoc)) return;
+
+  var pkg = require(pkgLoc);
+  packages.push({
+    folder: name,
+    pkg: pkg,
+    name: pkg.name
+  });
 });
 
 // create links