diff --git a/ChangeLog b/ChangeLog
index 3e0cf04eb3..5a0a789eb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jul 30 22:29:01 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_trap_eval): make the current thread runnable to deal with
+	  exceptions which occurred within the trap.  fixed: [ruby-dev:27729]
+
 Sat Jul 29 06:12:06 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: freeze ip_name for security reason.
diff --git a/eval.c b/eval.c
index 3a16c2855d..9bc43db6e7 100644
--- a/eval.c
+++ b/eval.c
@@ -10041,6 +10041,7 @@ rb_trap_eval(VALUE cmd, int sig, int safe)
 
     if (state) {
 	rb_trap_immediate = 0;
+	rb_thread_ready(curr_thread);
 	JUMP_TAG(state);
     }