diff --git a/lib/6to5/patch.js b/lib/6to5/patch.js
index ac1ff2670b..758cc49356 100644
--- a/lib/6to5/patch.js
+++ b/lib/6to5/patch.js
@@ -8,17 +8,22 @@ var _ = require("lodash");
 var estraverse = require("estraverse");
 _.extend(estraverse.VisitorKeys, t.VISITOR_KEYS);
 
-// regenerator/recast/ast-types
+// regenerator-6to5/ast-types
 
 var types = require("ast-types");
 var def   = types.Type.def;
 var or    = types.Type.or;
 
+def("File")
+  .bases("Node")
+  .build("program")
+  .field("program", def("Program"));
+
 def("AssignmentPattern")
-    .bases("Pattern")
-    .build("left", "right")
-    .field("left", def("Pattern"))
-    .field("right", def("Expression"));
+  .bases("Pattern")
+  .build("left", "right")
+  .field("left", def("Pattern"))
+  .field("right", def("Expression"));
 
 // Acorn - Same as ImportNamespaceSpecifier but `id` is `name`
 def("ImportBatchSpecifier")
diff --git a/lib/6to5/polyfill.js b/lib/6to5/polyfill.js
index 7a893bd69c..248d028a58 100644
--- a/lib/6to5/polyfill.js
+++ b/lib/6to5/polyfill.js
@@ -1,4 +1,4 @@
 "use strict";
 
 require("core-js/shim");
-require("regenerator/runtime");
+require("regenerator-6to5/runtime");
diff --git a/lib/6to5/transformation/transform.js b/lib/6to5/transformation/transform.js
index 5a8d63e74d..20ac0ef7a8 100644
--- a/lib/6to5/transformation/transform.js
+++ b/lib/6to5/transformation/transform.js
@@ -80,10 +80,10 @@ _.each({
   constants:                 require("./transformers/es6-constants"),
   letScoping:                require("./transformers/es6-let-scoping"),
   blockScopingTDZ:           require("./transformers/optional-block-scoping-tdz"),
+  generators:                require("./transformers/es6-generators"),
 
   _blockHoist:               require("./transformers/_block-hoist"),
 
-  generators:                require("./transformers/es6-generators"),
   restParameters:            require("./transformers/es6-rest-parameters"),
 
   protoToAssign:             require("./transformers/optional-proto-to-assign"),
diff --git a/lib/6to5/transformation/transformers/es6-generators.js b/lib/6to5/transformation/transformers/es6-generators.js
index 6d8124b709..7199c70fb5 100644
--- a/lib/6to5/transformation/transformers/es6-generators.js
+++ b/lib/6to5/transformation/transformers/es6-generators.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var regenerator = require("regenerator");
+var regenerator = require("regenerator-6to5");
 
 exports.ast = {
   before: function (ast, file) {
diff --git a/package.json b/package.json
index be1fd879c5..e7fbdb4053 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "lodash": "2.4.1",
     "output-file-sync": "^1.1.0",
     "private": "0.1.6",
-    "regenerator": "0.8.9",
+    "regenerator-6to5": "0.8.9-1",
     "regexpu": "1.0.0",
     "roadrunner": "1.0.4",
     "source-map": "0.1.43",
diff --git a/packages/build-runtime.js b/packages/build-runtime.js
index e14cefdaba..84005256a4 100644
--- a/packages/build-runtime.js
+++ b/packages/build-runtime.js
@@ -49,6 +49,6 @@ var buildHelpers = function () {
 
 writeFile("helpers.js", buildHelpers());
 writeFile("core-js.js", readFile("core-js/library"));
-writeFile("regenerator/index.js", readFile("regenerator/runtime-module"));
-writeFile("regenerator/runtime.js", readFile("regenerator/runtime"));
+writeFile("regenerator/index.js", readFile("regenerator-6to5/runtime-module"));
+writeFile("regenerator/runtime.js", readFile("regenerator-6to5/runtime"));
 updatePackage();