diff --git a/ChangeLog b/ChangeLog
index fd083d552e..cc2bb03f8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun 18 02:43:53 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* signal.c (sigsegv): clear gc_stress flag on SEGV.
+
 Mon Jun 18 01:14:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* variable.c (rb_path2class): get rid of dangling pointer caused by
diff --git a/signal.c b/signal.c
index af998b40cf..ce57784fe9 100644
--- a/signal.c
+++ b/signal.c
@@ -529,7 +529,9 @@ sigsegv(int sig)
 	exit(1);
     }
     else {
+	extern int gc_stress;
 	segv_received = 1;
+	gc_stress = 0;
 	rb_bug("Segmentation fault");
     }
 }