diff --git a/src/node.cc b/src/node.cc
index f9ffdcfa6f5a..0a9a0cd81e15 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -3415,6 +3415,19 @@ void AtExit(void (*cb)(void* arg), void* arg) {
 }
 
 
+void EmitBeforeExit(Environment* env) {
+  Context::Scope context_scope(env->context());
+  HandleScope handle_scope(env->isolate());
+  Local<Object> process_object = env->process_object();
+  Local<String> exit_code = FIXED_ONE_BYTE_STRING(env->isolate(), "exitCode");
+  Local<Value> args[] = {
+    FIXED_ONE_BYTE_STRING(env->isolate(), "beforeExit"),
+    process_object->Get(exit_code)->ToInteger()
+  };
+  MakeCallback(env, process_object, "emit", ARRAY_SIZE(args), args);
+}
+
+
 int EmitExit(Environment* env) {
   // process.emit('exit')
   HandleScope handle_scope(env->isolate());
@@ -3518,7 +3531,14 @@ int Start(int argc, char** argv) {
     // TODO(bnoordhuis) Reorder the debugger initialization logic so it can
     // be removed.
     Context::Scope context_scope(env->context());
-    uv_run(env->event_loop(), UV_RUN_DEFAULT);
+    bool more;
+    do {
+      more = uv_run(env->event_loop(), UV_RUN_ONCE);
+      if (more == false) {
+        EmitBeforeExit(env);
+        more = uv_run(env->event_loop(), UV_RUN_NOWAIT);
+      }
+    } while (more == true);
     code = EmitExit(env);
     RunAtExit(env);
     env->Dispose();
diff --git a/test/simple/test-process-before-exit.js b/test/simple/test-process-before-exit.js
new file mode 100644
index 000000000000..261ac253c5b1
--- /dev/null
+++ b/test/simple/test-process-before-exit.js
@@ -0,0 +1,34 @@
+// 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 assert = require('assert');
+var common = require('../common');
+
+var N = 5;
+var n = 0;
+
+function f() {
+  if (++n < N) setTimeout(f, 5);
+}
+process.on('beforeExit', f);
+process.on('exit', function() {
+  assert.equal(n, N + 1);  // The sixth time we let it through.
+});
diff --git a/test/simple/test-process-exit-from-before-exit.js b/test/simple/test-process-exit-from-before-exit.js
new file mode 100644
index 000000000000..4818a6c196df
--- /dev/null
+++ b/test/simple/test-process-exit-from-before-exit.js
@@ -0,0 +1,29 @@
+// 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 assert = require('assert');
+var common = require('../common');
+
+process.on('beforeExit', common.mustCall(function() {
+  setTimeout(assert.fail, 5);
+  process.exit(0);  // Should execute immediately even if we schedule new work.
+  assert.fail();
+}));