diff --git a/Makefile b/Makefile
index f07921c6f3..604fe9281a 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@ build: clean
 build-dist: build
 	cd packages/babel-core; \
 	scripts/build-dist.sh
+	cd packages/babel-polyfill; \
+	scripts/build-dist.sh
 	cd packages/babel-runtime; \
 	node scripts/build-dist.js
 
diff --git a/packages/babel-core/scripts/build-dist.sh b/packages/babel-core/scripts/build-dist.sh
index 2964c2c965..cefac7997a 100755
--- a/packages/babel-core/scripts/build-dist.sh
+++ b/packages/babel-core/scripts/build-dist.sh
@@ -9,9 +9,6 @@ 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
diff --git a/packages/babel-core/scripts/postpublish.js b/packages/babel-core/scripts/postpublish.js
index f94ca17ea5..726ad665e3 100755
--- a/packages/babel-core/scripts/postpublish.js
+++ b/packages/babel-core/scripts/postpublish.js
@@ -4,7 +4,5 @@ function rmRelative(loc) {
 
 rmRelative("browser.js");
 rmRelative("browser.min.js");
-rmRelative("browser-polyfill.js");
-rmRelative("browser-polyfill.min.js");
 rmRelative("external-helpers.js");
 rmRelative("external-helpers.min.js");
diff --git a/packages/babel-core/scripts/prepublish.js b/packages/babel-core/scripts/prepublish.js
index 065c00c233..95df529a6f 100755
--- a/packages/babel-core/scripts/prepublish.js
+++ b/packages/babel-core/scripts/prepublish.js
@@ -4,8 +4,6 @@ function relative(loc) {
 
 cp(relative("dist/browser.js"), relative("browser.js"));
 cp(relative("dist/browser.min.js"), relative("browser.min.js"));
-cp(relative("dist/polyfill.js"), relative("browser-polyfill.js"));
-cp(relative("dist/polyfill.min.js"), relative("browser-polyfill.min.js"));
 cp(relative("dist/external-helpers.js"), relative("external-helpers.js"));
 cp(relative("dist/external-helpers.min.js"), relative("external-helpers.min.js"));
 require("./cache-templates");
diff --git a/packages/babel-polyfill/scripts/build-dist.sh b/packages/babel-polyfill/scripts/build-dist.sh
new file mode 100644
index 0000000000..d2b3b9bd13
--- /dev/null
+++ b/packages/babel-polyfill/scripts/build-dist.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+BROWSERIFY_CMD="../../node_modules/browserify/bin/cmd.js"
+UGLIFY_CMD="../../node_modules/uglify-js/bin/uglifyjs"
+
+mkdir -p dist
+
+node $BROWSERIFY_CMD -e lib/index.js >dist/polyfill.js
+node $UGLIFY_CMD dist/index.js >dist/polyfill.min.js
diff --git a/packages/babel-polyfill/scripts/postpublish.js b/packages/babel-polyfill/scripts/postpublish.js
new file mode 100644
index 0000000000..7c9c8098fb
--- /dev/null
+++ b/packages/babel-polyfill/scripts/postpublish.js
@@ -0,0 +1 @@
+rm(__dirname + "/../browser.js");
diff --git a/packages/babel-polyfill/scripts/prepublish.js b/packages/babel-polyfill/scripts/prepublish.js
new file mode 100644
index 0000000000..bb37fec285
--- /dev/null
+++ b/packages/babel-polyfill/scripts/prepublish.js
@@ -0,0 +1,5 @@
+function relative(loc) {
+  return __dirname + "/../" + loc;
+}
+
+cp(relative("dist/polyfill.min.js"), relative("browser.js"));