diff --git a/ChangeLog b/ChangeLog
index 54374d6d77..319fb44ad6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep  1 18:34:25 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval): make tail recursion in ELSE clause of
+	  RESCUE a jump.
+
 Mon Sep  1 18:00:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* parse.y (aref_args): forgot to call NEW_SPLAT(). reported by
diff --git a/eval.c b/eval.c
index fff5692080..c66f4415a7 100644
--- a/eval.c
+++ b/eval.c
@@ -2809,8 +2809,8 @@ rb_eval(self, n)
 	    POP_TAG();
 	    if (state) JUMP_TAG(state);
 	    /* no exception raised */
-	    if (node->nd_else) { /* else clause given */
-		result = rb_eval(self, node->nd_else);
+	    if (node = node->nd_else) { /* else clause given */
+		goto again;
 	    }
 	}
         break;