diff --git a/ChangeLog b/ChangeLog
index 1d122fdbdb..eb4fb483ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jul 10 16:06:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (sigsegv): use abort() instead of exit() when nested
+	  SEGV was happen. Because unnested SEGV use abort().
+
 Sun Jul 10 15:30:00 2011  Kenta Murata  <mrkn@mrkn.jp>
 
 	* load.c (rb_f_autoload): prevent to autoload for singleton
diff --git a/signal.c b/signal.c
index 14b7d67344..7bad8c1d8a 100644
--- a/signal.c
+++ b/signal.c
@@ -607,7 +607,7 @@ sigsegv(int sig SIGINFO_ARG)
 #endif
     if (segv_received) {
 	fprintf(stderr, "SEGV received in SEGV handler\n");
-	exit(EXIT_FAILURE);
+	abort();
     }
     else {
 	extern int ruby_disable_gc_stress;