diff --git a/ChangeLog b/ChangeLog
index 3486fdb2fc..283c93deca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct  2 15:34:15 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (ruby_suppress_tracing): get rid of clobbering by
+	  longjmp.
+
 Fri Oct  2 09:20:35 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* eval.c (rb_origenviron): remove unused old variable.
diff --git a/thread.c b/thread.c
index adaaa8ebee..da4cf9cf30 100644
--- a/thread.c
+++ b/thread.c
@@ -4011,7 +4011,8 @@ VALUE
 ruby_suppress_tracing(VALUE (*func)(VALUE, int), VALUE arg, int always)
 {
     rb_thread_t *th = GET_THREAD();
-    int state, raised, tracing;
+    int state, tracing;
+    volatile int raised;
     VALUE result = Qnil;
 
     if ((tracing = th->tracing) != 0 && !always) {