diff --git a/ChangeLog b/ChangeLog
index 1aad2ef49a..17284bdea7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 29 17:16:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_longjmp): must not disturb original jump.
+	  [ruby-dev:21733]
+
 Wed Oct 29 15:28:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (Init_Proc): taint preallocated exception object
diff --git a/eval.c b/eval.c
index cac306671b..1078b85fcb 100644
--- a/eval.c
+++ b/eval.c
@@ -3950,7 +3950,7 @@ rb_longjmp(tag, mesg)
 	}
 	POP_TAG();
 	if (status == TAG_FATAL && ruby_errinfo == exception_error) {
-	    ruby_errinfo = Qnil;
+	    ruby_errinfo = mesg;
 	}
 	else if (status) {
 	    thread_reset_raised();