diff --git a/packages/babel-cli/src/_babel-node b/packages/babel-cli/src/_babel-node.js
similarity index 100%
rename from packages/babel-cli/src/_babel-node
rename to packages/babel-cli/src/_babel-node.js
diff --git a/packages/babel-cli/src/babel-external-helpers b/packages/babel-cli/src/babel-external-helpers.js
similarity index 95%
rename from packages/babel-cli/src/babel-external-helpers
rename to packages/babel-cli/src/babel-external-helpers.js
index 8c85f0352c..60aa08551e 100755
--- a/packages/babel-cli/src/babel-external-helpers
+++ b/packages/babel-cli/src/babel-external-helpers.js
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 var commander = require("commander");
 var util      = require("babel-core").util;
 var runtime   = require("babel-core").buildExternalHelpers;
diff --git a/packages/babel-cli/src/babel-node b/packages/babel-cli/src/babel-node.js
similarity index 99%
rename from packages/babel-cli/src/babel-node
rename to packages/babel-cli/src/babel-node.js
index 29d6643b97..7e9aa639ff 100755
--- a/packages/babel-cli/src/babel-node
+++ b/packages/babel-cli/src/babel-node.js
@@ -1,11 +1,10 @@
-#!/usr/bin/env node
-
 /**
  * This tiny wrapper file checks for known node flags and appends them
  * when found, before invoking the "real" _babel-node(1) executable.
  */
 
-var args  = [__dirname + "/_babel-node"];
+var path = require("path");
+var args = [path.join(__dirname, "_babel-node")];
 
 var babelArgs = process.argv.slice(2);
 var userArgs;
@@ -407,7 +406,6 @@ babelArgs.forEach(function(arg){
     case "--debugger_port":
     case "--debug_compile_events":
     case "--debug_script_collected_events":
-    case "--gdbjit":
     case "--log_runtime":
     case "--prof_auto":
     case "--prof_lazy":
@@ -446,6 +444,6 @@ try {
       } else {
         process.exit(code);
       }
-    })
+    });
   });
 }