diff --git a/ChangeLog b/ChangeLog
index 377a2db83b..d823dfaf11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 23 13:27:44 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* eval.c (rb_yield_0): restore source file/line after yield.
+
 Mon Jan 21 22:57:18 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
 	* signal.c (ruby_signal): must define sighandler_t unless
diff --git a/eval.c b/eval.c
index c7c5708c64..be5858c2d1 100644
--- a/eval.c
+++ b/eval.c
@@ -3670,6 +3670,8 @@ rb_yield_0(val, self, klass, pcall)
     struct BLOCK * volatile block;
     struct SCOPE * volatile old_scope;
     struct FRAME frame;
+    char *const file = ruby_sourcefile;
+    int line = ruby_sourceline;
     int state;
     static unsigned serial = 1;
 
@@ -3794,6 +3796,8 @@ rb_yield_0(val, self, klass, pcall)
     if (ruby_scope->flags & SCOPE_DONT_RECYCLE)
        scope_dup(old_scope);
     ruby_scope = old_scope;
+    ruby_sourcefile = file;
+    ruby_sourceline = line;
     if (state) {
 	if (!block->tag) {
 	    switch (state & TAG_MASK) {