diff --git a/Makefile b/Makefile
index fc04c5d3ed..c4cf7518eb 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,8 @@ publish:
 bootstrap:
 	npm install
 	./node_modules/.bin/lerna bootstrap
+	# remove all existing babel-runtimes and use the top-level babel-runtime
+	rm -rf packages/*/node_modules/babel-runtime
 	make build
 	cd packages/babel-runtime; \
 	node scripts/build-dist.js
diff --git a/package.json b/package.json
index 99cbd2078c..4fd91f9fd2 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,14 @@
   "license": "MIT",
   "devDependencies": {
     "async": "^1.5.0",
-    "babel": "5.8.21",
+    "babel-core": "^6.3.17",
+    "babel-plugin-transform-runtime": "^6.3.13",
+    "babel-plugin-transform-class-properties": "^6.6.0",
+    "babel-plugin-transform-flow-strip-types": "^6.3.13",
+    "babel-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.6.0",
+    "babel-preset-es2015-loose": "^7.0.0",
+    "babel-preset-stage-0": "^6.0.0",
     "browserify": "^11.2.0",
     "bundle-collapser": "^1.2.1",
     "chai": "^2.2.0",
@@ -14,7 +21,7 @@
     "kcheck": "^2.0.0",
     "fs-readdir-recursive": "^0.1.2",
     "gulp": "^3.9.0",
-    "gulp-babel": "^5.3.0",
+    "gulp-babel": "^6.0.0",
     "gulp-newer": "^1.0.0",
     "gulp-plumber": "^1.0.1",
     "gulp-util": "^3.0.7",
@@ -37,26 +44,17 @@
     "uglify-js": "^2.4.16"
   },
   "babel": {
-    "ignore": [
-      "packages/babel-cli/src/babel-plugin/templates"
-    ],
-    "stage": 0,
-    "loose": [
-      "all"
-    ],
-    "blacklist": [
-      "es6.tailCall"
-    ],
-    "optional": [
-      "flow",
-      "optimisation.flow.forOf",
-      "runtime"
+    "presets": ["stage-0", "es2015-loose"],
+    "plugins": [
+      "./scripts/add-module-exports",
+      "transform-runtime",
+      "transform-class-properties",
+      "transform-flow-strip-types"
     ],
     "env": {
       "test": {
         "auxiliaryCommentBefore": "istanbul ignore next"
       }
-    },
-    "breakConfig": true
+    }
   }
 }
diff --git a/packages/babel-cli/package.json b/packages/babel-cli/package.json
index 11e5109600..de01ec8e32 100644
--- a/packages/babel-cli/package.json
+++ b/packages/babel-cli/package.json
@@ -10,7 +10,7 @@
     "babel-core": "^6.7.7",
     "babel-register": "^6.6.5",
     "babel-polyfill": "^6.6.0",
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "bin-version-check": "^2.1.0",
     "chalk": "1.1.1",
     "commander": "^2.8.1",
diff --git a/packages/babel-code-frame/package.json b/packages/babel-code-frame/package.json
index 4b6bd43c6c..d59c48edfb 100644
--- a/packages/babel-code-frame/package.json
+++ b/packages/babel-code-frame/package.json
@@ -8,7 +8,7 @@
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-code-frame",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "chalk": "^1.1.0",
     "esutils": "^2.0.2",
     "js-tokens": "^1.0.2"
diff --git a/packages/babel-core/package.json b/packages/babel-core/package.json
index e131bd948a..b5c99d0244 100644
--- a/packages/babel-core/package.json
+++ b/packages/babel-core/package.json
@@ -29,7 +29,7 @@
     "babel-helpers": "^6.6.0",
     "babel-messages": "^6.7.2",
     "babel-template": "^6.7.0",
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-register": "^6.7.2",
     "babel-traverse": "^6.7.6",
     "babel-types": "^6.7.7",
diff --git a/packages/babel-core/src/api/browser.js b/packages/babel-core/src/api/browser.js
index 31731b6335..1c53951acf 100644
--- a/packages/babel-core/src/api/browser.js
+++ b/packages/babel-core/src/api/browser.js
@@ -2,7 +2,25 @@
 /* eslint no-new-func: 0 */
 
 import { transform } from "./node";
-export * from "./node";
+export {
+  File,
+  options,
+  buildExternalHelpers,
+  template,
+  version,
+  util,
+  messages,
+  types,
+  traverse,
+  OptionManager,
+  Plugin,
+  Pipeline,
+  analyse,
+  transform,
+  transformFromAst,
+  transformFile,
+  transformFileSync
+} from "./node";
 
 export function run(code: string, opts: Object = {}): any {
   return new Function(transform(code, opts).code)();
diff --git a/packages/babel-generator/package.json b/packages/babel-generator/package.json
index ca78633977..7fdff73bc1 100644
--- a/packages/babel-generator/package.json
+++ b/packages/babel-generator/package.json
@@ -12,7 +12,7 @@
   ],
   "dependencies": {
     "babel-messages": "^6.7.2",
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-types": "^6.7.7",
     "detect-indent": "^3.0.1",
     "is-integer": "^1.0.4",
diff --git a/packages/babel-helper-bindify-decorators/package.json b/packages/babel-helper-bindify-decorators/package.json
index 8c2f92cd8c..d21db90d17 100644
--- a/packages/babel-helper-bindify-decorators/package.json
+++ b/packages/babel-helper-bindify-decorators/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-traverse": "^6.6.5",
     "babel-types": "^6.6.5"
   }
diff --git a/packages/babel-helper-builder-binary-assignment-operator-visitor/package.json b/packages/babel-helper-builder-binary-assignment-operator-visitor/package.json
index a19772c9bf..333c5edd22 100644
--- a/packages/babel-helper-builder-binary-assignment-operator-visitor/package.json
+++ b/packages/babel-helper-builder-binary-assignment-operator-visitor/package.json
@@ -7,7 +7,7 @@
   "main": "lib/index.js",
   "dependencies": {
     "babel-helper-explode-assignable-expression": "^6.6.5",
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-types": "^6.6.5"
   }
 }
diff --git a/packages/babel-helper-builder-conditional-assignment-operator-visitor/package.json b/packages/babel-helper-builder-conditional-assignment-operator-visitor/package.json
index dc85f26de0..deca2eaf4a 100644
--- a/packages/babel-helper-builder-conditional-assignment-operator-visitor/package.json
+++ b/packages/babel-helper-builder-conditional-assignment-operator-visitor/package.json
@@ -7,7 +7,7 @@
   "main": "lib/index.js",
   "dependencies": {
     "babel-helper-explode-assignable-expression": "^6.6.5",
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-types": "^6.6.5"
   }
 }
diff --git a/packages/babel-helper-builder-react-jsx/package.json b/packages/babel-helper-builder-react-jsx/package.json
index f40c0dd63d..d3b3be67b2 100644
--- a/packages/babel-helper-builder-react-jsx/package.json
+++ b/packages/babel-helper-builder-react-jsx/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-types": "^6.6.5",
     "esutils": "^2.0.0",
     "lodash": "^3.10.0"
diff --git a/packages/babel-helper-call-delegate/package.json b/packages/babel-helper-call-delegate/package.json
index 96b9366bd4..9b28a0d861 100644
--- a/packages/babel-helper-call-delegate/package.json
+++ b/packages/babel-helper-call-delegate/package.json
@@ -7,7 +7,7 @@
   "main": "lib/index.js",
   "dependencies": {
     "babel-traverse": "^6.6.5",
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-types": "^6.6.5",
     "babel-helper-hoist-variables": "^6.6.5"
   }
diff --git a/packages/babel-helper-define-map/package.json b/packages/babel-helper-define-map/package.json
index 188a97b2b7..cb6570442b 100644
--- a/packages/babel-helper-define-map/package.json
+++ b/packages/babel-helper-define-map/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "lodash": "^3.10.0",
     "babel-types": "^6.6.5",
     "babel-helper-function-name": "^6.6.0"
diff --git a/packages/babel-helper-explode-assignable-expression/package.json b/packages/babel-helper-explode-assignable-expression/package.json
index 1f7354fb4d..bf5ac4cc0c 100644
--- a/packages/babel-helper-explode-assignable-expression/package.json
+++ b/packages/babel-helper-explode-assignable-expression/package.json
@@ -7,7 +7,7 @@
   "main": "lib/index.js",
   "dependencies": {
     "babel-traverse": "^6.6.5",
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-types": "^6.6.5"
   }
 }
diff --git a/packages/babel-helper-explode-class/package.json b/packages/babel-helper-explode-class/package.json
index a51c2a569e..1649d090b5 100644
--- a/packages/babel-helper-explode-class/package.json
+++ b/packages/babel-helper-explode-class/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-traverse": "^6.6.5",
     "babel-types": "^6.6.5",
     "babel-helper-bindify-decorators": "^6.6.5"
diff --git a/packages/babel-helper-fixtures/package.json b/packages/babel-helper-fixtures/package.json
index f994d4ba42..d6b4ae870d 100644
--- a/packages/babel-helper-fixtures/package.json
+++ b/packages/babel-helper-fixtures/package.json
@@ -7,7 +7,7 @@
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-fixtures",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "lodash": "^3.10.0",
     "path-exists": "^1.0.0",
     "trim-right": "^1.0.1",
diff --git a/packages/babel-helper-function-name/package.json b/packages/babel-helper-function-name/package.json
index 543d22e236..b747851c53 100644
--- a/packages/babel-helper-function-name/package.json
+++ b/packages/babel-helper-function-name/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-types": "^6.6.0",
     "babel-traverse": "^6.6.0",
     "babel-helper-get-function-arity": "^6.3.13",
diff --git a/packages/babel-helper-get-function-arity/package.json b/packages/babel-helper-get-function-arity/package.json
index 992a8d7cb9..9a23463654 100644
--- a/packages/babel-helper-get-function-arity/package.json
+++ b/packages/babel-helper-get-function-arity/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-types": "^6.6.5"
   }
 }
diff --git a/packages/babel-helper-hoist-variables/package.json b/packages/babel-helper-hoist-variables/package.json
index 5242eea45b..5a198bf496 100644
--- a/packages/babel-helper-hoist-variables/package.json
+++ b/packages/babel-helper-hoist-variables/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-types": "^6.6.5"
   }
 }
diff --git a/packages/babel-helper-optimise-call-expression/package.json b/packages/babel-helper-optimise-call-expression/package.json
index 2ae85af845..54cf9a27b3 100644
--- a/packages/babel-helper-optimise-call-expression/package.json
+++ b/packages/babel-helper-optimise-call-expression/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-types": "^6.6.0"
   }
 }
diff --git a/packages/babel-helper-plugin-test-runner/package.json b/packages/babel-helper-plugin-test-runner/package.json
index 2f7855b775..d39f27cd5b 100644
--- a/packages/babel-helper-plugin-test-runner/package.json
+++ b/packages/babel-helper-plugin-test-runner/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-helper-transform-fixture-test-runner": "^6.3.13"
   }
 }
diff --git a/packages/babel-helper-regex/package.json b/packages/babel-helper-regex/package.json
index f98a4895f2..091f5c73ea 100644
--- a/packages/babel-helper-regex/package.json
+++ b/packages/babel-helper-regex/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "lodash": "^3.10.0",
     "babel-types": "^6.6.5"
   }
diff --git a/packages/babel-helper-remap-async-to-generator/package.json b/packages/babel-helper-remap-async-to-generator/package.json
index 90f5111821..b4dfe6b734 100644
--- a/packages/babel-helper-remap-async-to-generator/package.json
+++ b/packages/babel-helper-remap-async-to-generator/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-template": "^6.7.0",
     "babel-types": "^6.7.0",
     "babel-traverse": "^6.7.0",
diff --git a/packages/babel-helper-replace-supers/package.json b/packages/babel-helper-replace-supers/package.json
index f16a7e474b..d963668265 100644
--- a/packages/babel-helper-replace-supers/package.json
+++ b/packages/babel-helper-replace-supers/package.json
@@ -7,7 +7,7 @@
   "main": "lib/index.js",
   "dependencies": {
     "babel-helper-optimise-call-expression": "^6.6.0",
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-traverse": "^6.7.0",
     "babel-messages": "^6.6.5",
     "babel-template": "^6.7.0",
diff --git a/packages/babel-helper-transform-fixture-test-runner/package.json b/packages/babel-helper-transform-fixture-test-runner/package.json
index 1668ad465b..37bec5a2ee 100644
--- a/packages/babel-helper-transform-fixture-test-runner/package.json
+++ b/packages/babel-helper-transform-fixture-test-runner/package.json
@@ -8,7 +8,7 @@
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helper-transform-fixture-test-runner",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-register": "^6.6.5",
     "babel-core": "^6.6.5",
     "babel-polyfill": "^6.3.13",
diff --git a/packages/babel-helpers/package.json b/packages/babel-helpers/package.json
index 081d4f7f2b..a93b4a60e9 100644
--- a/packages/babel-helpers/package.json
+++ b/packages/babel-helpers/package.json
@@ -8,7 +8,7 @@
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-helpers",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-template": "^6.6.0"
   }
 }
diff --git a/packages/babel-messages/package.json b/packages/babel-messages/package.json
index 4ad33b2dc7..f895cd36a0 100644
--- a/packages/babel-messages/package.json
+++ b/packages/babel-messages/package.json
@@ -8,6 +8,6 @@
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-messages",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   }
 }
diff --git a/packages/babel-plugin-check-es2015-constants/package.json b/packages/babel-plugin-check-es2015-constants/package.json
index 42ef1a4ec1..6bf6070da4 100644
--- a/packages/babel-plugin-check-es2015-constants/package.json
+++ b/packages/babel-plugin-check-es2015-constants/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-external-helpers/package.json b/packages/babel-plugin-external-helpers/package.json
index d1511817c5..9d7a6aed1c 100644
--- a/packages/babel-plugin-external-helpers/package.json
+++ b/packages/babel-plugin-external-helpers/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-syntax-async-functions/package.json b/packages/babel-plugin-syntax-async-functions/package.json
index 5b776692d2..7c03ce897d 100644
--- a/packages/babel-plugin-syntax-async-functions/package.json
+++ b/packages/babel-plugin-syntax-async-functions/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-syntax-async-generators/package.json b/packages/babel-plugin-syntax-async-generators/package.json
index 93411dd4bf..1eabfaba12 100644
--- a/packages/babel-plugin-syntax-async-generators/package.json
+++ b/packages/babel-plugin-syntax-async-generators/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-syntax-class-constructor-call/package.json b/packages/babel-plugin-syntax-class-constructor-call/package.json
index 96948afe6f..522d8acf9c 100644
--- a/packages/babel-plugin-syntax-class-constructor-call/package.json
+++ b/packages/babel-plugin-syntax-class-constructor-call/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-syntax-class-properties/package.json b/packages/babel-plugin-syntax-class-properties/package.json
index 556485fb7f..65d84f9dae 100644
--- a/packages/babel-plugin-syntax-class-properties/package.json
+++ b/packages/babel-plugin-syntax-class-properties/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-syntax-decorators/package.json b/packages/babel-plugin-syntax-decorators/package.json
index c74be26b9f..d2bd5fae30 100644
--- a/packages/babel-plugin-syntax-decorators/package.json
+++ b/packages/babel-plugin-syntax-decorators/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-syntax-do-expressions/package.json b/packages/babel-plugin-syntax-do-expressions/package.json
index 53028ada64..a8c38467a4 100644
--- a/packages/babel-plugin-syntax-do-expressions/package.json
+++ b/packages/babel-plugin-syntax-do-expressions/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-syntax-exponentiation-operator/package.json b/packages/babel-plugin-syntax-exponentiation-operator/package.json
index 4ca5da97df..e9f358acbd 100644
--- a/packages/babel-plugin-syntax-exponentiation-operator/package.json
+++ b/packages/babel-plugin-syntax-exponentiation-operator/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-syntax-export-extensions/package.json b/packages/babel-plugin-syntax-export-extensions/package.json
index 2cfd7ed5f8..2728816ebe 100644
--- a/packages/babel-plugin-syntax-export-extensions/package.json
+++ b/packages/babel-plugin-syntax-export-extensions/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-syntax-flow/package.json b/packages/babel-plugin-syntax-flow/package.json
index 9841cefa28..8739b20287 100644
--- a/packages/babel-plugin-syntax-flow/package.json
+++ b/packages/babel-plugin-syntax-flow/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-syntax-function-bind/package.json b/packages/babel-plugin-syntax-function-bind/package.json
index 275adcce62..b2ccc7e17f 100644
--- a/packages/babel-plugin-syntax-function-bind/package.json
+++ b/packages/babel-plugin-syntax-function-bind/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-syntax-function-sent/package.json b/packages/babel-plugin-syntax-function-sent/package.json
index d7ba992bdc..bcf6053867 100644
--- a/packages/babel-plugin-syntax-function-sent/package.json
+++ b/packages/babel-plugin-syntax-function-sent/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-syntax-jsx/package.json b/packages/babel-plugin-syntax-jsx/package.json
index 20be58d2d6..a7869f4a02 100644
--- a/packages/babel-plugin-syntax-jsx/package.json
+++ b/packages/babel-plugin-syntax-jsx/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-syntax-object-rest-spread/package.json b/packages/babel-plugin-syntax-object-rest-spread/package.json
index db99d30d48..07d60f296d 100644
--- a/packages/babel-plugin-syntax-object-rest-spread/package.json
+++ b/packages/babel-plugin-syntax-object-rest-spread/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-syntax-trailing-function-commas/package.json b/packages/babel-plugin-syntax-trailing-function-commas/package.json
index 57c0f5e261..bbe977e5cd 100644
--- a/packages/babel-plugin-syntax-trailing-function-commas/package.json
+++ b/packages/babel-plugin-syntax-trailing-function-commas/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-async-functions/package.json b/packages/babel-plugin-transform-async-functions/package.json
index 034ccd5085..265577653a 100644
--- a/packages/babel-plugin-transform-async-functions/package.json
+++ b/packages/babel-plugin-transform-async-functions/package.json
@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "babel-plugin-syntax-async-functions": "^6.3.13",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-async-to-generator/package.json b/packages/babel-plugin-transform-async-to-generator/package.json
index 675d7f1628..e5915d738f 100644
--- a/packages/babel-plugin-transform-async-to-generator/package.json
+++ b/packages/babel-plugin-transform-async-to-generator/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "babel-helper-remap-async-to-generator": "^6.7.0",
     "babel-plugin-syntax-async-functions": "^6.3.13",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-async-to-module-method/package.json b/packages/babel-plugin-transform-async-to-module-method/package.json
index 98c6f224e7..75a492a963 100644
--- a/packages/babel-plugin-transform-async-to-module-method/package.json
+++ b/packages/babel-plugin-transform-async-to-module-method/package.json
@@ -12,7 +12,7 @@
     "babel-plugin-syntax-async-functions": "^6.3.13",
     "babel-helper-remap-async-to-generator": "^6.7.0",
     "babel-types": "^6.7.0",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-class-constructor-call/package.json b/packages/babel-plugin-transform-class-constructor-call/package.json
index 453cf06300..2d8430d148 100644
--- a/packages/babel-plugin-transform-class-constructor-call/package.json
+++ b/packages/babel-plugin-transform-class-constructor-call/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "babel-template": "^6.6.5",
     "babel-plugin-syntax-class-constructor-call": "^6.3.13",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-class-properties/package.json b/packages/babel-plugin-transform-class-properties/package.json
index ab3e353541..330cc432cd 100644
--- a/packages/babel-plugin-transform-class-properties/package.json
+++ b/packages/babel-plugin-transform-class-properties/package.json
@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "babel-plugin-syntax-class-properties": "^6.3.13",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-decorators/package.json b/packages/babel-plugin-transform-decorators/package.json
index b5354af7a8..1275c64586 100644
--- a/packages/babel-plugin-transform-decorators/package.json
+++ b/packages/babel-plugin-transform-decorators/package.json
@@ -14,7 +14,7 @@
     "babel-plugin-syntax-decorators": "^6.3.13",
     "babel-helper-explode-class": "^6.6.5",
     "babel-template": "^6.6.5",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-do-expressions/package.json b/packages/babel-plugin-transform-do-expressions/package.json
index 398c111c68..d26d0ea21c 100644
--- a/packages/babel-plugin-transform-do-expressions/package.json
+++ b/packages/babel-plugin-transform-do-expressions/package.json
@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "babel-plugin-syntax-do-expressions": "^6.3.13",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-es2015-arrow-functions/package.json b/packages/babel-plugin-transform-es2015-arrow-functions/package.json
index bf11a991db..b4af6bf0c9 100644
--- a/packages/babel-plugin-transform-es2015-arrow-functions/package.json
+++ b/packages/babel-plugin-transform-es2015-arrow-functions/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-es2015-block-scoped-functions/package.json b/packages/babel-plugin-transform-es2015-block-scoped-functions/package.json
index 56dc5f624d..cf48c56ef5 100644
--- a/packages/babel-plugin-transform-es2015-block-scoped-functions/package.json
+++ b/packages/babel-plugin-transform-es2015-block-scoped-functions/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-es2015-block-scoping/package.json b/packages/babel-plugin-transform-es2015-block-scoping/package.json
index e527ce3841..ad9ad2ad51 100644
--- a/packages/babel-plugin-transform-es2015-block-scoping/package.json
+++ b/packages/babel-plugin-transform-es2015-block-scoping/package.json
@@ -10,7 +10,7 @@
     "babel-types": "^6.7.0",
     "babel-template": "^6.7.0",
     "lodash": "^3.10.0",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "keywords": [
     "babel-plugin"
diff --git a/packages/babel-plugin-transform-es2015-classes/package.json b/packages/babel-plugin-transform-es2015-classes/package.json
index 4ffcae3002..d30db158c1 100644
--- a/packages/babel-plugin-transform-es2015-classes/package.json
+++ b/packages/babel-plugin-transform-es2015-classes/package.json
@@ -13,7 +13,7 @@
     "babel-traverse": "^6.6.5",
     "babel-helper-define-map": "^6.6.5",
     "babel-messages": "^6.6.5",
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-types": "^6.7.7"
   },
   "keywords": [
diff --git a/packages/babel-plugin-transform-es2015-computed-properties/package.json b/packages/babel-plugin-transform-es2015-computed-properties/package.json
index c40d64c8bf..2d48275645 100644
--- a/packages/babel-plugin-transform-es2015-computed-properties/package.json
+++ b/packages/babel-plugin-transform-es2015-computed-properties/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "babel-helper-define-map": "^6.6.5",
     "babel-template": "^6.6.5",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-es2015-destructuring/package.json b/packages/babel-plugin-transform-es2015-destructuring/package.json
index f5396cc9db..3f02773385 100644
--- a/packages/babel-plugin-transform-es2015-destructuring/package.json
+++ b/packages/babel-plugin-transform-es2015-destructuring/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-es2015-duplicate-keys/package.json b/packages/babel-plugin-transform-es2015-duplicate-keys/package.json
index 454c489d0e..44e7268b76 100644
--- a/packages/babel-plugin-transform-es2015-duplicate-keys/package.json
+++ b/packages/babel-plugin-transform-es2015-duplicate-keys/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-types": "^6.6.4"
   },
   "devDependencies": {
diff --git a/packages/babel-plugin-transform-es2015-for-of/package.json b/packages/babel-plugin-transform-es2015-for-of/package.json
index e30167605b..6f7bb44e82 100644
--- a/packages/babel-plugin-transform-es2015-for-of/package.json
+++ b/packages/babel-plugin-transform-es2015-for-of/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-es2015-function-name/package.json b/packages/babel-plugin-transform-es2015-function-name/package.json
index 2da1402c11..5fdbe2beb1 100644
--- a/packages/babel-plugin-transform-es2015-function-name/package.json
+++ b/packages/babel-plugin-transform-es2015-function-name/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "babel-helper-function-name": "^6.4.0",
     "babel-types": "^6.4.0",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-es2015-instanceof/package.json b/packages/babel-plugin-transform-es2015-instanceof/package.json
index 102b8a8e4c..e1aeb82ca3 100644
--- a/packages/babel-plugin-transform-es2015-instanceof/package.json
+++ b/packages/babel-plugin-transform-es2015-instanceof/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-es2015-literals/package.json b/packages/babel-plugin-transform-es2015-literals/package.json
index 02cc926ea9..37f7eb010d 100644
--- a/packages/babel-plugin-transform-es2015-literals/package.json
+++ b/packages/babel-plugin-transform-es2015-literals/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-es2015-modules-amd/package.json b/packages/babel-plugin-transform-es2015-modules-amd/package.json
index 87d6a2b801..576593f7ab 100644
--- a/packages/babel-plugin-transform-es2015-modules-amd/package.json
+++ b/packages/babel-plugin-transform-es2015-modules-amd/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "babel-plugin-transform-es2015-modules-commonjs": "^6.6.5",
     "babel-template": "^6.6.5",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "keywords": [
     "babel-plugin"
diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/package.json b/packages/babel-plugin-transform-es2015-modules-commonjs/package.json
index 16604bb6e6..5a2779d4db 100644
--- a/packages/babel-plugin-transform-es2015-modules-commonjs/package.json
+++ b/packages/babel-plugin-transform-es2015-modules-commonjs/package.json
@@ -7,7 +7,7 @@
   "main": "lib/index.js",
   "dependencies": {
     "babel-types": "^6.7.7",
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-template": "^6.7.0",
     "babel-plugin-transform-strict-mode": "^6.6.5"
   },
diff --git a/packages/babel-plugin-transform-es2015-modules-systemjs/package.json b/packages/babel-plugin-transform-es2015-modules-systemjs/package.json
index 8cd8cc74a0..f7a4352fa0 100644
--- a/packages/babel-plugin-transform-es2015-modules-systemjs/package.json
+++ b/packages/babel-plugin-transform-es2015-modules-systemjs/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "babel-template": "^6.6.5",
     "babel-helper-hoist-variables": "^6.6.5",
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-plugin-transform-strict-mode": "^6.6.5"
   },
   "keywords": [
diff --git a/packages/babel-plugin-transform-es2015-modules-umd/package.json b/packages/babel-plugin-transform-es2015-modules-umd/package.json
index eff6507557..cf1a52e431 100644
--- a/packages/babel-plugin-transform-es2015-modules-umd/package.json
+++ b/packages/babel-plugin-transform-es2015-modules-umd/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "babel-plugin-transform-es2015-modules-amd": "^6.6.5",
     "babel-template": "^6.6.5",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "keywords": [
     "babel-plugin"
diff --git a/packages/babel-plugin-transform-es2015-object-super/package.json b/packages/babel-plugin-transform-es2015-object-super/package.json
index aa452b2cf6..b3583aded7 100644
--- a/packages/babel-plugin-transform-es2015-object-super/package.json
+++ b/packages/babel-plugin-transform-es2015-object-super/package.json
@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "babel-helper-replace-supers": "^6.6.5",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-es2015-parameters/package.json b/packages/babel-plugin-transform-es2015-parameters/package.json
index 739c1d5911..16364f638d 100644
--- a/packages/babel-plugin-transform-es2015-parameters/package.json
+++ b/packages/babel-plugin-transform-es2015-parameters/package.json
@@ -11,7 +11,7 @@
     "babel-helper-get-function-arity": "^6.6.5",
     "babel-template": "^6.7.0",
     "babel-types": "^6.7.0",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "keywords": [
     "babel-plugin"
diff --git a/packages/babel-plugin-transform-es2015-shorthand-properties/package.json b/packages/babel-plugin-transform-es2015-shorthand-properties/package.json
index 5c0a1c0ac8..e3c045b966 100644
--- a/packages/babel-plugin-transform-es2015-shorthand-properties/package.json
+++ b/packages/babel-plugin-transform-es2015-shorthand-properties/package.json
@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "babel-types": "^6.3.13",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-es2015-spread/package.json b/packages/babel-plugin-transform-es2015-spread/package.json
index 9f346d5be6..57369b2ee6 100644
--- a/packages/babel-plugin-transform-es2015-spread/package.json
+++ b/packages/babel-plugin-transform-es2015-spread/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-es2015-sticky-regex/package.json b/packages/babel-plugin-transform-es2015-sticky-regex/package.json
index e354955474..67d4d2c421 100644
--- a/packages/babel-plugin-transform-es2015-sticky-regex/package.json
+++ b/packages/babel-plugin-transform-es2015-sticky-regex/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "babel-helper-regex": "^6.3.13",
     "babel-types": "^6.3.13",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-es2015-template-literals/package.json b/packages/babel-plugin-transform-es2015-template-literals/package.json
index 20681575fc..ec2b954454 100644
--- a/packages/babel-plugin-transform-es2015-template-literals/package.json
+++ b/packages/babel-plugin-transform-es2015-template-literals/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-es2015-typeof-symbol/package.json b/packages/babel-plugin-transform-es2015-typeof-symbol/package.json
index 601b2348ac..44da0d1352 100644
--- a/packages/babel-plugin-transform-es2015-typeof-symbol/package.json
+++ b/packages/babel-plugin-transform-es2015-typeof-symbol/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-es2015-unicode-regex/package.json b/packages/babel-plugin-transform-es2015-unicode-regex/package.json
index 27a75165ec..fdb97c2105 100644
--- a/packages/babel-plugin-transform-es2015-unicode-regex/package.json
+++ b/packages/babel-plugin-transform-es2015-unicode-regex/package.json
@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "babel-helper-regex": "^6.3.13",
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "regexpu-core": "^1.0.0"
   },
   "devDependencies": {
diff --git a/packages/babel-plugin-transform-es3-member-expression-literals/package.json b/packages/babel-plugin-transform-es3-member-expression-literals/package.json
index b821337048..ce4434c617 100644
--- a/packages/babel-plugin-transform-es3-member-expression-literals/package.json
+++ b/packages/babel-plugin-transform-es3-member-expression-literals/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-es3-property-literals/package.json b/packages/babel-plugin-transform-es3-property-literals/package.json
index 5b2025430f..40a5627081 100644
--- a/packages/babel-plugin-transform-es3-property-literals/package.json
+++ b/packages/babel-plugin-transform-es3-property-literals/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-es5-property-mutators/package.json b/packages/babel-plugin-transform-es5-property-mutators/package.json
index f9cf1cbbf1..9ee6f0b41e 100644
--- a/packages/babel-plugin-transform-es5-property-mutators/package.json
+++ b/packages/babel-plugin-transform-es5-property-mutators/package.json
@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "babel-helper-define-map": "^6.6.5",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-eval/package.json b/packages/babel-plugin-transform-eval/package.json
index 3ebcc0d933..840b9f6ea4 100644
--- a/packages/babel-plugin-transform-eval/package.json
+++ b/packages/babel-plugin-transform-eval/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-exponentiation-operator/package.json b/packages/babel-plugin-transform-exponentiation-operator/package.json
index b824c8fd34..ec6b5a6da8 100644
--- a/packages/babel-plugin-transform-exponentiation-operator/package.json
+++ b/packages/babel-plugin-transform-exponentiation-operator/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "babel-plugin-syntax-exponentiation-operator": "^6.3.13",
     "babel-helper-builder-binary-assignment-operator-visitor": "^6.3.13",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-export-extensions/package.json b/packages/babel-plugin-transform-export-extensions/package.json
index 80ab761746..a6a772098b 100644
--- a/packages/babel-plugin-transform-export-extensions/package.json
+++ b/packages/babel-plugin-transform-export-extensions/package.json
@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "babel-plugin-syntax-export-extensions": "^6.3.13",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-flow-comments/package.json b/packages/babel-plugin-transform-flow-comments/package.json
index dd88c8aa36..212a1d6497 100644
--- a/packages/babel-plugin-transform-flow-comments/package.json
+++ b/packages/babel-plugin-transform-flow-comments/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-plugin-syntax-flow": "^6.3.13"
   },
   "devDependencies": {
diff --git a/packages/babel-plugin-transform-flow-strip-types/package.json b/packages/babel-plugin-transform-flow-strip-types/package.json
index 2a539d41b7..d5d527665b 100644
--- a/packages/babel-plugin-transform-flow-strip-types/package.json
+++ b/packages/babel-plugin-transform-flow-strip-types/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-plugin-syntax-flow": "^6.3.13"
   },
   "devDependencies": {
diff --git a/packages/babel-plugin-transform-function-bind/package.json b/packages/babel-plugin-transform-function-bind/package.json
index 4828346dae..3fbc543467 100644
--- a/packages/babel-plugin-transform-function-bind/package.json
+++ b/packages/babel-plugin-transform-function-bind/package.json
@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "babel-plugin-syntax-function-bind": "^6.3.13",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-inline-environment-variables/package.json b/packages/babel-plugin-transform-inline-environment-variables/package.json
index 7ee8e631ea..7353b2c584 100644
--- a/packages/babel-plugin-transform-inline-environment-variables/package.json
+++ b/packages/babel-plugin-transform-inline-environment-variables/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-jscript/package.json b/packages/babel-plugin-transform-jscript/package.json
index 72df25dea2..413cca44cd 100644
--- a/packages/babel-plugin-transform-jscript/package.json
+++ b/packages/babel-plugin-transform-jscript/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-member-expression-literals/package.json b/packages/babel-plugin-transform-member-expression-literals/package.json
index 7df9068f42..de15ad8680 100644
--- a/packages/babel-plugin-transform-member-expression-literals/package.json
+++ b/packages/babel-plugin-transform-member-expression-literals/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-merge-sibling-variables/package.json b/packages/babel-plugin-transform-merge-sibling-variables/package.json
index a84e285db7..1e07502cd6 100644
--- a/packages/babel-plugin-transform-merge-sibling-variables/package.json
+++ b/packages/babel-plugin-transform-merge-sibling-variables/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-minify-booleans/package.json b/packages/babel-plugin-transform-minify-booleans/package.json
index cda23a365f..23cc981072 100644
--- a/packages/babel-plugin-transform-minify-booleans/package.json
+++ b/packages/babel-plugin-transform-minify-booleans/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-node-env-inline/package.json b/packages/babel-plugin-transform-node-env-inline/package.json
index da1450aaae..a47f9a7825 100644
--- a/packages/babel-plugin-transform-node-env-inline/package.json
+++ b/packages/babel-plugin-transform-node-env-inline/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-object-assign/package.json b/packages/babel-plugin-transform-object-assign/package.json
index 18ad896783..dc65dc1966 100644
--- a/packages/babel-plugin-transform-object-assign/package.json
+++ b/packages/babel-plugin-transform-object-assign/package.json
@@ -10,7 +10,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-object-rest-spread/package.json b/packages/babel-plugin-transform-object-rest-spread/package.json
index c9f885355e..6c79b2b848 100644
--- a/packages/babel-plugin-transform-object-rest-spread/package.json
+++ b/packages/babel-plugin-transform-object-rest-spread/package.json
@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "babel-plugin-syntax-object-rest-spread": "^6.3.13",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-object-set-prototype-of-to-assign/package.json b/packages/babel-plugin-transform-object-set-prototype-of-to-assign/package.json
index 2e159ea41f..e37827e88d 100644
--- a/packages/babel-plugin-transform-object-set-prototype-of-to-assign/package.json
+++ b/packages/babel-plugin-transform-object-set-prototype-of-to-assign/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-property-literals/package.json b/packages/babel-plugin-transform-property-literals/package.json
index d6d3ed3815..580df90772 100644
--- a/packages/babel-plugin-transform-property-literals/package.json
+++ b/packages/babel-plugin-transform-property-literals/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-proto-to-assign/package.json b/packages/babel-plugin-transform-proto-to-assign/package.json
index 95650df172..1d69192b8b 100644
--- a/packages/babel-plugin-transform-proto-to-assign/package.json
+++ b/packages/babel-plugin-transform-proto-to-assign/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "lodash": "^3.9.3"
   },
   "devDependencies": {
diff --git a/packages/babel-plugin-transform-react-constant-elements/package.json b/packages/babel-plugin-transform-react-constant-elements/package.json
index d0243e19a9..c0eb6d90b0 100644
--- a/packages/babel-plugin-transform-react-constant-elements/package.json
+++ b/packages/babel-plugin-transform-react-constant-elements/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-react-display-name/package.json b/packages/babel-plugin-transform-react-display-name/package.json
index 13c11eede4..7bfcc5a020 100644
--- a/packages/babel-plugin-transform-react-display-name/package.json
+++ b/packages/babel-plugin-transform-react-display-name/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-react-inline-elements/package.json b/packages/babel-plugin-transform-react-inline-elements/package.json
index 7f92940f3e..1933842404 100644
--- a/packages/babel-plugin-transform-react-inline-elements/package.json
+++ b/packages/babel-plugin-transform-react-inline-elements/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-react-jsx-compat/package.json b/packages/babel-plugin-transform-react-jsx-compat/package.json
index 8578b5d35a..7908a7fc9b 100644
--- a/packages/babel-plugin-transform-react-jsx-compat/package.json
+++ b/packages/babel-plugin-transform-react-jsx-compat/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-helper-builder-react-jsx": "^6.3.13"
   },
   "devDependencies": {
diff --git a/packages/babel-plugin-transform-react-jsx-source/package.json b/packages/babel-plugin-transform-react-jsx-source/package.json
index 2e8f8a86fb..8cca3aff44 100644
--- a/packages/babel-plugin-transform-react-jsx-source/package.json
+++ b/packages/babel-plugin-transform-react-jsx-source/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-plugin-syntax-jsx": "^6.3.13"
   },
   "devDependencies": {
diff --git a/packages/babel-plugin-transform-react-jsx/package.json b/packages/babel-plugin-transform-react-jsx/package.json
index d164d9d69e..2b1532647e 100644
--- a/packages/babel-plugin-transform-react-jsx/package.json
+++ b/packages/babel-plugin-transform-react-jsx/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-helper-builder-react-jsx": "^6.7.5",
     "babel-plugin-syntax-jsx": "^6.3.13"
   },
diff --git a/packages/babel-plugin-transform-regenerator/package.json b/packages/babel-plugin-transform-regenerator/package.json
index 21aae27eef..db4cd96f0a 100644
--- a/packages/babel-plugin-transform-regenerator/package.json
+++ b/packages/babel-plugin-transform-regenerator/package.json
@@ -11,7 +11,7 @@
     "babel-plugin-syntax-async-functions": "^6.3.13",
     "babel-plugin-transform-es2015-for-of": "^6.6.0",
     "babel-core": "^6.6.5",
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-traverse": "^6.6.5",
     "babel-types": "^6.6.5",
     "babylon": "^6.6.5",
diff --git a/packages/babel-plugin-transform-remove-console/package.json b/packages/babel-plugin-transform-remove-console/package.json
index da378c1921..1f26cc2c59 100644
--- a/packages/babel-plugin-transform-remove-console/package.json
+++ b/packages/babel-plugin-transform-remove-console/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-remove-debugger/package.json b/packages/babel-plugin-transform-remove-debugger/package.json
index db6348d0b0..8a2f91bae8 100644
--- a/packages/babel-plugin-transform-remove-debugger/package.json
+++ b/packages/babel-plugin-transform-remove-debugger/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-runtime/package.json b/packages/babel-plugin-transform-runtime/package.json
index 9f7fefe475..702b174578 100644
--- a/packages/babel-plugin-transform-runtime/package.json
+++ b/packages/babel-plugin-transform-runtime/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-simplify-comparison-operators/package.json b/packages/babel-plugin-transform-simplify-comparison-operators/package.json
index b855c4a7ad..6cc9170348 100644
--- a/packages/babel-plugin-transform-simplify-comparison-operators/package.json
+++ b/packages/babel-plugin-transform-simplify-comparison-operators/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-transform-strict-mode/package.json b/packages/babel-plugin-transform-strict-mode/package.json
index b9a2d3a891..84b9c2ccf1 100644
--- a/packages/babel-plugin-transform-strict-mode/package.json
+++ b/packages/babel-plugin-transform-strict-mode/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-types": "^6.6.5"
   },
   "devDependencies": {
diff --git a/packages/babel-plugin-transform-undefined-to-void/package.json b/packages/babel-plugin-transform-undefined-to-void/package.json
index 9292738b9d..b4d72abb0d 100644
--- a/packages/babel-plugin-transform-undefined-to-void/package.json
+++ b/packages/babel-plugin-transform-undefined-to-void/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   },
   "devDependencies": {
     "babel-helper-plugin-test-runner": "^6.3.13"
diff --git a/packages/babel-plugin-undeclared-variables-check/package.json b/packages/babel-plugin-undeclared-variables-check/package.json
index fbedbf624a..3eee3ff75c 100644
--- a/packages/babel-plugin-undeclared-variables-check/package.json
+++ b/packages/babel-plugin-undeclared-variables-check/package.json
@@ -9,7 +9,7 @@
     "babel-plugin"
   ],
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "leven": "^1.0.2"
   },
   "devDependencies": {
diff --git a/packages/babel-polyfill/package.json b/packages/babel-polyfill/package.json
index b1193d059b..8c44fb9c84 100644
--- a/packages/babel-polyfill/package.json
+++ b/packages/babel-polyfill/package.json
@@ -10,6 +10,6 @@
   "dependencies": {
     "core-js": "^2.1.0",
     "babel-regenerator-runtime": "^6.3.13",
-    "babel-runtime": "^5.0.0"
+    "babel-runtime": "^6.0.0"
   }
 }
diff --git a/packages/babel-register/package.json b/packages/babel-register/package.json
index 78b9a07711..76e1e841d2 100644
--- a/packages/babel-register/package.json
+++ b/packages/babel-register/package.json
@@ -9,7 +9,7 @@
   "browser": "lib/browser.js",
   "dependencies": {
     "babel-core": "^6.7.2",
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "core-js": "^2.1.0",
     "home-or-tmp": "^1.0.0",
     "lodash": "^3.10.0",
diff --git a/packages/babel-template/package.json b/packages/babel-template/package.json
index 6e4768162a..25b5dcb847 100644
--- a/packages/babel-template/package.json
+++ b/packages/babel-template/package.json
@@ -11,7 +11,7 @@
     "babylon": "^6.7.0",
     "babel-traverse": "^6.7.0",
     "babel-types": "^6.7.0",
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "lodash": "^3.10.1"
   }
 }
diff --git a/packages/babel-traverse/package.json b/packages/babel-traverse/package.json
index 3746b94be5..9b7820ae6a 100644
--- a/packages/babel-traverse/package.json
+++ b/packages/babel-traverse/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "babel-code-frame": "^6.7.5",
     "babel-messages": "^6.7.2",
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-types": "^6.7.2",
     "babylon": "^6.7.0",
     "debug": "^2.2.0",
diff --git a/packages/babel-types/package.json b/packages/babel-types/package.json
index 8a9a12c1af..f01d96396a 100644
--- a/packages/babel-types/package.json
+++ b/packages/babel-types/package.json
@@ -8,7 +8,7 @@
   "repository": "https://github.com/babel/babel/tree/master/packages/babel-types",
   "main": "lib/index.js",
   "dependencies": {
-    "babel-runtime": "^5.0.0",
+    "babel-runtime": "^6.0.0",
     "babel-traverse": "^6.7.2",
     "esutils": "^2.0.2",
     "lodash": "^3.10.1",
diff --git a/packages/babel-types/src/index.js b/packages/babel-types/src/index.js
index e7e63eb126..913368d9ba 100644
--- a/packages/babel-types/src/index.js
+++ b/packages/babel-types/src/index.js
@@ -3,6 +3,7 @@ import compact from "lodash/array/compact";
 import loClone from "lodash/lang/clone";
 import each from "lodash/collection/each";
 import uniq from "lodash/array/uniq";
+import traverse from "babel-traverse";
 
 let t = exports;
 
@@ -12,9 +13,12 @@ let t = exports;
  */
 
 function registerType(type: string) {
-  let is = t[`is${type}`] = function (node, opts) {
-    return t.is(type, node, opts);
-  };
+  let is = t[`is${type}`];
+  if (!is) {
+    is = t[`is${type}`] = function (node, opts) {
+      return t.is(type, node, opts);
+    };
+  }
 
   t[`assert${type}`] = function (node, opts) {
     opts = opts || {};
@@ -26,7 +30,27 @@ function registerType(type: string) {
 
 //
 
-export * from "./constants";
+export {
+  STATEMENT_OR_BLOCK_KEYS,
+  FLATTENABLE_KEYS,
+  FOR_INIT_KEYS,
+  COMMENT_KEYS,
+  LOGICAL_OPERATORS,
+  UPDATE_OPERATORS,
+  BOOLEAN_NUMBER_BINARY_OPERATORS,
+  EQUALITY_BINARY_OPERATORS,
+  COMPARISON_BINARY_OPERATORS,
+  BOOLEAN_BINARY_OPERATORS,
+  NUMBER_BINARY_OPERATORS,
+  BINARY_OPERATORS,
+  BOOLEAN_UNARY_OPERATORS,
+  NUMBER_UNARY_OPERATORS,
+  STRING_UNARY_OPERATORS,
+  UNARY_OPERATORS,
+  INHERIT_KEYS,
+  BLOCK_SCOPED_SYMBOL,
+  NOT_LOCAL_BINDING
+} from "./constants";
 
 import "./definitions/init";
 import { VISITOR_KEYS, ALIAS_KEYS, NODE_FIELDS, BUILDER_KEYS, DEPRECATED_KEYS } from "./definitions";
@@ -376,12 +400,6 @@ function _inheritComments(key, child, parent) {
   }
 }
 
-
-// Can't use import because of cyclic dependency between babel-traverse
-// and this module (babel-types). This require needs to appear after
-// we export the TYPES constant.
-const traverse = require("babel-traverse").default;
-
 /**
  * Inherit all contextual properties from `parent` node to `child` node.
  */
@@ -436,7 +454,37 @@ toFastProperties(t);
 toFastProperties(t.VISITOR_KEYS);
 
 //
-export * from "./retrievers";
-export * from "./validators";
-export * from "./converters";
-export * from "./flow";
+export {
+  getBindingIdentifiers,
+  getOuterBindingIdentifiers
+} from "./retrievers";
+
+export {
+  isBinding,
+  isReferenced,
+  isValidIdentifier,
+  isLet,
+  isBlockScoped,
+  isVar,
+  isSpecifierDefault,
+  isScope,
+  isImmutable
+} from "./validators";
+
+export {
+  toComputedKey,
+  toSequenceExpression,
+  toKeyAlias,
+  toIdentifier,
+  toBindingIdentifierName,
+  toStatement,
+  toExpression,
+  toBlock,
+  valueToNode
+} from "./converters";
+
+export {
+  createUnionTypeAnnotation,
+  removeTypeDuplicates,
+  createTypeAnnotationBasedOnTypeof
+} from "./flow";
diff --git a/scripts/add-module-exports.js b/scripts/add-module-exports.js
new file mode 100644
index 0000000000..d0e89a17cf
--- /dev/null
+++ b/scripts/add-module-exports.js
@@ -0,0 +1,47 @@
+// "add-module-exports"
+module.exports = function (babel) {
+  var t = babel.types;
+  return {
+    visitor: {
+      Program: {
+        exit: function(path) {
+          if (path.BABEL_PLUGIN_ADD_MODULE_EXPORTS) {
+            return;
+          }
+
+          var hasExportDefault = false;
+          var hasExportNamed = false;
+          var body = path.get("body");
+
+          path.get('body').forEach(function (path) {
+            if (path.isExportDefaultDeclaration()) {
+              hasExportDefault = true;
+              return;
+            }
+
+            if (path.isExportNamedDeclaration()) {
+              if (path.node.specifiers.length === 1 && path.node.specifiers[0].exported.name === "default") {
+                hasExportDefault = true;
+              } else {
+                hasExportNamed = true;
+              }
+              return;
+            }
+          });
+
+          if (hasExportDefault && !hasExportNamed) {
+            path.pushContainer("body", [
+              t.expressionStatement(t.assignmentExpression(
+                "=",
+                t.memberExpression(t.identifier("module"), t.identifier("exports")),
+                t.memberExpression(t.identifier("exports"), t.stringLiteral("default"), true)
+              ))
+            ]);
+          }
+
+          path.BABEL_PLUGIN_ADD_MODULE_EXPORTS = true;
+        }
+      }
+    }
+  }
+}