diff --git a/src/node.cc b/src/node.cc
index 7cfbe1f46..46ea2492b 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -1776,7 +1776,8 @@ static void AtExit() {
 
 
 static void SignalExit(int signal) {
-  ev_unloop(EV_DEFAULT_ EVUNLOOP_ALL);
+  AtExit();
+  exit(1);
 }
 
 
diff --git a/test/simple/test-sigint-infinite-loop.js b/test/simple/test-sigint-infinite-loop.js
new file mode 100644
index 000000000..3505f4a9a
--- /dev/null
+++ b/test/simple/test-sigint-infinite-loop.js
@@ -0,0 +1,36 @@
+// This test is to assert that we can SIGINT a script which loops forever.
+// ref: http://groups.google.com/group/nodejs-dev/browse_thread/thread/e20f2f8df0296d3f
+var common = require('../common');
+var assert = require('assert');
+var spawn = require('child_process').spawn;
+
+console.log("start");
+
+var c = spawn(process.execPath, ['-e', 'while(true) { console.log("hi"); }']);
+
+var sentKill = false;
+var gotChildExit = true;
+
+c.stdout.on('data', function (s) {
+  // Prevent race condition:
+  // Wait for the first bit of output from the child process
+  // so that we're sure that it's in the V8 event loop and not 
+  // just in the startup phase of execution.
+  if (!sentKill) {
+    c.kill('SIGINT')
+    console.log("SIGINT infinite-loop.js");
+    sentKill = true;
+  }
+});
+
+c.on('exit', function (code) {
+  assert.ok(code !== 0);
+  console.log("killed infinite-loop.js");
+  gotChildExit = true;
+});
+
+process.on('exit', function () {
+  assert.ok(sentKill);
+  assert.ok(gotChildExit);
+});
+