diff --git a/lib/6to5/generation/generators/modules.js b/lib/6to5/generation/generators/modules.js
index 60d39d5edf..871afe085f 100644
--- a/lib/6to5/generation/generators/modules.js
+++ b/lib/6to5/generation/generators/modules.js
@@ -25,9 +25,10 @@ exports.ExportDeclaration = function (node, print) {
 
   if (node.declaration) {
     print(node.declaration);
+    if (t.isStatement(node.declaration)) return;
   } else {
     if (specifiers.length === 1 && t.isExportBatchSpecifier(specifiers[0])) {
-      this.push("*");
+      print(specifiers[0]);
     } else {
       this.push("{");
       if (specifiers.length) {