diff --git a/lib/6to5/file.js b/lib/6to5/file.js
index aefbfa2903..aeef4eac07 100644
--- a/lib/6to5/file.js
+++ b/lib/6to5/file.js
@@ -3,9 +3,9 @@ module.exports = File;
 var SHEBANG_REGEX = /^\#\!.*/;
 
 var transform = require("./transform");
-var recast    = require("recast");
+var recast    = require("acorn-recast");
 var util      = require("./util");
-var b         = require("ast-types").builders;
+var b         = require("acorn-ast-types").builders;
 var _         = require("lodash");
 
 function File(opts) {
diff --git a/lib/6to5/modules/amd.js b/lib/6to5/modules/amd.js
index e8858fbff3..971c44c678 100644
--- a/lib/6to5/modules/amd.js
+++ b/lib/6to5/modules/amd.js
@@ -2,7 +2,7 @@ module.exports = AMDFormatter;
 
 var CommonJSFormatter = require("./common");
 var util              = require("../util");
-var b                 = require("ast-types").builders;
+var b                 = require("acorn-ast-types").builders;
 var _                 = require("lodash");
 
 function AMDFormatter(file) {
diff --git a/lib/6to5/modules/common.js b/lib/6to5/modules/common.js
index 7bbfe4528c..bbb672a118 100644
--- a/lib/6to5/modules/common.js
+++ b/lib/6to5/modules/common.js
@@ -1,7 +1,7 @@
 module.exports = CommonJSFormatter;
 
 var util = require("../util");
-var b    = require("ast-types").builders;
+var b    = require("acorn-ast-types").builders;
 
 function CommonJSFormatter(file) {
   this.file = file;
diff --git a/lib/6to5/modules/umd.js b/lib/6to5/modules/umd.js
index 16f9d89e52..a73e876554 100644
--- a/lib/6to5/modules/umd.js
+++ b/lib/6to5/modules/umd.js
@@ -2,7 +2,7 @@ module.exports = UMDFormatter;
 
 var AMDFormatter = require("./amd");
 var util         = require("../util");
-var b            = require("ast-types").builders;
+var b            = require("acorn-ast-types").builders;
 var _            = require("lodash");
 
 function UMDFormatter(file) {
diff --git a/lib/6to5/transform.js b/lib/6to5/transform.js
index 25bc7d8003..0a3442dde6 100644
--- a/lib/6to5/transform.js
+++ b/lib/6to5/transform.js
@@ -2,7 +2,7 @@ module.exports = transform;
 
 var Transformer = require("./transformer");
 var sourceMap   = require("source-map");
-var recast      = require("recast");
+var recast      = require("acorn-recast");
 var File        = require("./file");
 var util        = require("./util");
 var _           = require("lodash");
diff --git a/lib/6to5/transformers/_alias-functions.js b/lib/6to5/transformers/_alias-functions.js
index eb1ab30a22..d0895d8de5 100644
--- a/lib/6to5/transformers/_alias-functions.js
+++ b/lib/6to5/transformers/_alias-functions.js
@@ -1,6 +1,6 @@
 var traverse = require("../traverse");
 var util     = require("../util");
-var b        = require("ast-types").builders;
+var b        = require("acorn-ast-types").builders;
 
 var go = function (getBody, node, file) {
   var argumentsId;
diff --git a/lib/6to5/transformers/_declarations.js b/lib/6to5/transformers/_declarations.js
index 35ae415211..733e8923af 100644
--- a/lib/6to5/transformers/_declarations.js
+++ b/lib/6to5/transformers/_declarations.js
@@ -1,4 +1,4 @@
-var b = require("ast-types").builders;
+var b = require("acorn-ast-types").builders;
 var _ = require("lodash");
 
 module.exports = function (ast, file) {
diff --git a/lib/6to5/transformers/array-comprehension.js b/lib/6to5/transformers/array-comprehension.js
index ae744c9e8c..72bf66076f 100644
--- a/lib/6to5/transformers/array-comprehension.js
+++ b/lib/6to5/transformers/array-comprehension.js
@@ -1,5 +1,5 @@
 var util = require("../util");
-var b    = require("ast-types").builders;
+var b    = require("acorn-ast-types").builders;
 
 var single = function (node) {
   var block = node.blocks[0];
diff --git a/lib/6to5/transformers/computed-property-names.js b/lib/6to5/transformers/computed-property-names.js
index e8ab042db3..da1cf6e300 100644
--- a/lib/6to5/transformers/computed-property-names.js
+++ b/lib/6to5/transformers/computed-property-names.js
@@ -1,5 +1,5 @@
 var util = require("../util");
-var b    = require("ast-types").builders;
+var b    = require("acorn-ast-types").builders;
 var _    = require("lodash");
 
 exports.ObjectExpression = function (node, parent, file) {
diff --git a/lib/6to5/transformers/destructuring.js b/lib/6to5/transformers/destructuring.js
index 068fe98556..5f0ad3bc55 100644
--- a/lib/6to5/transformers/destructuring.js
+++ b/lib/6to5/transformers/destructuring.js
@@ -1,6 +1,6 @@
 var traverse = require("../traverse");
 var util     = require("../util");
-var b        = require("ast-types").builders;
+var b        = require("acorn-ast-types").builders;
 var _        = require("lodash");
 
 var buildVariableAssign = function (kind, id, init) {
diff --git a/lib/6to5/transformers/for-of.js b/lib/6to5/transformers/for-of.js
index 77912996a6..e29c6c66bf 100644
--- a/lib/6to5/transformers/for-of.js
+++ b/lib/6to5/transformers/for-of.js
@@ -1,5 +1,5 @@
 var util = require("../util");
-var b    = require("ast-types").builders;
+var b    = require("acorn-ast-types").builders;
 
 exports.ForOfStatement = function (node, parent, file) {
   var left = node.left;
diff --git a/lib/6to5/transformers/jsx/index.js b/lib/6to5/transformers/jsx/index.js
index 14ae97c7c0..fcc2711e79 100644
--- a/lib/6to5/transformers/jsx/index.js
+++ b/lib/6to5/transformers/jsx/index.js
@@ -2,7 +2,7 @@
 // https://github.com/RReverser/jsx-transpiler
 
 var esutils = require("esutils");
-var b       = require("recast").types.builders;
+var b       = require("acorn-ast-types").builders;
 var _       = require("lodash");
 
 var JSX_ANNOTATION_REGEX = /^\*\s*@jsx\s+([^\s]+)/;
diff --git a/lib/6to5/transformers/let-scoping.js b/lib/6to5/transformers/let-scoping.js
index e1cfb7dd23..a473d6f79e 100644
--- a/lib/6to5/transformers/let-scoping.js
+++ b/lib/6to5/transformers/let-scoping.js
@@ -1,6 +1,6 @@
 var traverse = require("../traverse");
 var util     = require("../util");
-var b        = require("ast-types").builders;
+var b        = require("acorn-ast-types").builders;
 var _        = require("lodash");
 
 exports.VariableDeclaration = function (node, parent, file) {
diff --git a/lib/6to5/transformers/modules.js b/lib/6to5/transformers/modules.js
index 4d7076239f..c93aab04bc 100644
--- a/lib/6to5/transformers/modules.js
+++ b/lib/6to5/transformers/modules.js
@@ -1,13 +1,4 @@
-var types = require("ast-types");
-var _     = require("lodash");
-var def   = types.Type.def;
-
-def("ImportBatchSpecifier")
-  .bases("Specifier")
-  .build("id")
-  .field("id", def("Identifier"));
-
-types.finalize();
+var _ = require("lodash");
 
 exports.ImportDeclaration = function (node, parent, file) {
   var nodes = [];
diff --git a/lib/6to5/transformers/react.js b/lib/6to5/transformers/react.js
index 9a413abba7..9732174fa0 100644
--- a/lib/6to5/transformers/react.js
+++ b/lib/6to5/transformers/react.js
@@ -1,4 +1,4 @@
-var b = require("recast").types.builders;
+var b = require("acorn-ast-types").builders;
 var _ = require("lodash");
 
 var addDisplayName = function (id, call) {
diff --git a/lib/6to5/transformers/rest-parameters.js b/lib/6to5/transformers/rest-parameters.js
index c7ccb315a4..9ad33b58c4 100644
--- a/lib/6to5/transformers/rest-parameters.js
+++ b/lib/6to5/transformers/rest-parameters.js
@@ -1,5 +1,5 @@
 var util = require("../util");
-var b    = require("ast-types").builders;
+var b    = require("acorn-ast-types").builders;
 
 exports.Function = function (node, parent, file) {
   if (!node.rest) return;
diff --git a/lib/6to5/transformers/spread.js b/lib/6to5/transformers/spread.js
index 26e18163d4..8766aca3e5 100644
--- a/lib/6to5/transformers/spread.js
+++ b/lib/6to5/transformers/spread.js
@@ -1,5 +1,5 @@
 var util = require("../util");
-var b    = require("ast-types").builders;
+var b    = require("acorn-ast-types").builders;
 var _    = require("lodash");
 
 var getSpreadLiteral = function (spread, file) {
diff --git a/lib/6to5/transformers/template-literals.js b/lib/6to5/transformers/template-literals.js
index 20f81f0b00..de0efbe9ba 100644
--- a/lib/6to5/transformers/template-literals.js
+++ b/lib/6to5/transformers/template-literals.js
@@ -1,4 +1,4 @@
-var b = require("ast-types").builders;
+var b = require("acorn-ast-types").builders;
 var _ = require("lodash");
 
 var buildBinaryExpression = function (left, right) {
diff --git a/lib/6to5/transformers/unicode-regex.js b/lib/6to5/transformers/unicode-regex.js
index 0866a4f6fe..34f142c417 100644
--- a/lib/6to5/transformers/unicode-regex.js
+++ b/lib/6to5/transformers/unicode-regex.js
@@ -1,5 +1,5 @@
 var rewritePattern = require("regexpu/rewrite-pattern");
-var b              = require("ast-types").builders;
+var b              = require("acorn-ast-types").builders;
 var _              = require("lodash");
 
 exports.Literal = function (node) {
diff --git a/lib/6to5/transformers/use-strict.js b/lib/6to5/transformers/use-strict.js
index f603a4bffb..f6bfd8ea18 100644
--- a/lib/6to5/transformers/use-strict.js
+++ b/lib/6to5/transformers/use-strict.js
@@ -1,4 +1,4 @@
-var b = require("ast-types").builders;
+var b = require("acorn-ast-types").builders;
 
 module.exports = function (ast, file) {
   var body = ast.program.body;
diff --git a/lib/6to5/util.js b/lib/6to5/util.js
index ca7d411ddb..6968c755b8 100644
--- a/lib/6to5/util.js
+++ b/lib/6to5/util.js
@@ -1,7 +1,6 @@
 var traverse = require("./traverse");
-var astTypes = require("ast-types");
-var recast   = require("recast");
-var acorn    = require("acorn-jsx");
+var astTypes = require("acorn-ast-types");
+var recast   = require("acorn-recast");
 var path     = require("path");
 var util     = require("util");
 var fs       = require("fs");
@@ -254,26 +253,6 @@ exports.parse = function (opts, code, callback) {
   try {
     var recastOpts = {};
 
-    recastOpts.esprima = {
-      parse: function (src) {
-        var comments = [];
-        var tokens = [];
-
-        var ast = acorn.parse(src, {
-          ecmaVersion: 6,
-          locations:   true,
-          onComment:   comments,
-          onToken:     tokens,
-          ranges:      true
-        });
-
-        ast.tokens = tokens;
-        ast.comments = comments;
-
-        return ast;
-      }
-    };
-
     if (opts.sourceMap) {
       recastOpts.sourceFileName = opts.sourceFileName;
       recastOpts.sourceRoot     = opts.sourceRoot;
diff --git a/package.json b/package.json
index a4679132f5..3d80e7f430 100644
--- a/package.json
+++ b/package.json
@@ -46,9 +46,9 @@
     "regenerator": "0.6.7",
     "chokidar": "0.10.0",
     "source-map-support": "0.2.7",
-    "ast-types": "0.5.3",
     "esutils": "1.1.4",
-    "acorn-jsx": "0.9.1-1"
+    "acorn-recast": "^0.8.0-2",
+    "acorn-ast-types": "^0.5.3-1"
   },
   "devDependencies": {
     "istanbul": "0.3.2",