diff --git a/ChangeLog b/ChangeLog
index 009284ef93..d724580ebe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 26 18:26:28 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (signal_exec): add volatile to make sure setjmp safe.
+
 Mon Nov 26 18:19:47 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* signal.c (signal_exec): suppress "warning: variable 'signum'
diff --git a/signal.c b/signal.c
index ea82faf500..713e5cd5b6 100644
--- a/signal.c
+++ b/signal.c
@@ -624,7 +624,7 @@ static void
 signal_exec(VALUE cmd, int safe, int sig)
 {
     rb_thread_t *cur_th = GET_THREAD();
-    int old_in_trap = cur_th->in_trap;
+    volatile int old_in_trap = cur_th->in_trap;
     int state;
 
     cur_th->in_trap = 1;
@@ -634,6 +634,7 @@ signal_exec(VALUE cmd, int safe, int sig)
 	rb_eval_cmd(cmd, rb_ary_new3(1, signum), safe);
     }
     TH_POP_TAG();
+    cur_th = GET_THREAD();
     cur_th->in_trap = old_in_trap;
 
     if (state) {