diff --git a/ChangeLog b/ChangeLog
index 7024132e83..d099b1fa88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct  6 00:49:15 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* eval.c (rb_load): should not pass blocks to the loaded file.
+	  [ruby-dev:18458]
+
 Fri Oct  4 20:25:38 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* eval.c (rb_thread_interrupt, rb_thread_signal_raise): no need to
diff --git a/eval.c b/eval.c
index b5a09f5c4c..31a7cae5d8 100644
--- a/eval.c
+++ b/eval.c
@@ -5346,6 +5346,7 @@ rb_load(fname, wrap)
 	rb_extend_object(self, ruby_class);
 	PUSH_CREF(ruby_wrapper);
     }
+    PUSH_ITER(ITER_NOT);
     PUSH_FRAME();
     ruby_frame->last_func = 0;
     ruby_frame->last_class = 0;
@@ -5380,6 +5381,7 @@ rb_load(fname, wrap)
     ruby_cref = saved_cref;
     POP_SCOPE();
     POP_FRAME();
+    POP_ITER();
     POP_CLASS();
     POP_VARS();
     ruby_wrapper = wrapper;