diff --git a/src/node.js b/src/node.js
index 80f30a0109..239a1abc91 100644
--- a/src/node.js
+++ b/src/node.js
@@ -328,6 +328,10 @@
       // For supporting legacy API we put the FD here.
       stdin.fd = fd;
 
+      // stdin starts out life in a paused state, but node doesn't
+      // know yet.  Call pause() explicitly to unref() it.
+      stdin.pause();
+
       return stdin;
     });
 
diff --git a/test/simple/test-stdin-hang.js b/test/simple/test-stdin-hang.js
new file mode 100644
index 0000000000..1edbf8c25b
--- /dev/null
+++ b/test/simple/test-stdin-hang.js
@@ -0,0 +1,31 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+
+// This test *only* verifies that invoking the stdin getter does not
+// cause node to hang indefinitely.
+// If it does, then the test-runner will nuke it.
+
+// invoke the getter.
+process.stdin;
+
+console.error('Should exit normally now.');