diff --git a/lib/6to5/patch.js b/lib/6to5/patch.js
index d985c29b19..804c477aeb 100644
--- a/lib/6to5/patch.js
+++ b/lib/6to5/patch.js
@@ -1,13 +1,26 @@
-var estraverse = require("estraverse");
-var types      = require("ast-types");
-var t          = require("./types");
-var _          = require("lodash");
+var t = require("./types");
+var _ = require("lodash");
 
-var def = types.Type.def;
+var types = require("ast-types");
+var def   = types.Type.def;
 
+// Program wrapper
+def("File")
+  .bases("Node")
+  .build("program")
+  .field("program", def("Program"));
+
+// Non-standard Acorn type
 def("ParenthesizedExpression")
   .bases("Expression")
   .build("expression")
   .field("expression", def("Expression"));
 
+// Same as ImportNamespaceSpecifier but `id` is `name`
+def("ImportBatchSpecifier")
+  .bases("Specifier")
+  .build("name")
+  .field("name", def("Identifier"));
+
+var estraverse = require("estraverse");
 _.extend(estraverse.VisitorKeys, t.VISITOR_KEYS);