diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap_node.js
index 71a6c529041b47..ccabffd8a6e342 100644
--- a/lib/internal/bootstrap_node.js
+++ b/lib/internal/bootstrap_node.js
@@ -76,6 +76,10 @@
       // Start the debugger agent
       NativeModule.require('_debugger').start();
 
+    } else if (process.argv[1] === 'inspect') {
+      // Start the debugger agent
+      NativeModule.require('node-inspect/lib/_inspect').start();
+
     } else if (process.argv[1] === '--remote_debugging_server') {
       // Start the debugging server
       NativeModule.require('internal/inspector/remote_debugging_server');
diff --git a/node.gyp b/node.gyp
index 41c7e72ead36d3..b3e56946488c08 100644
--- a/node.gyp
+++ b/node.gyp
@@ -113,6 +113,9 @@
       'deps/v8/tools/tickprocessor.js',
       'deps/v8/tools/SourceMap.js',
       'deps/v8/tools/tickprocessor-driver.js',
+      'deps/node-inspect/lib/_inspect.js',
+      'deps/node-inspect/lib/internal/inspect_client.js',
+      'deps/node-inspect/lib/internal/inspect_repl.js',
     ],
     'conditions': [
       [ 'node_shared=="true"', {