diff --git a/ChangeLog b/ChangeLog
index b37e094f24..2c54f2a0e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,11 @@ Mon Jul 27 10:24:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/rdoc/parser.rb (RDoc::Parser.binary?): fix for empty files.
 	  [ruby-dev:38848]
 
+Mon Jul 27 06:51:41 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (argf_eof): should call next_argv() before testing.
+	  [ruby-core:24561]
+
 Sun Jul 26 19:17:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (argf_eof): go to the next file if called after ARGF.close
diff --git a/io.c b/io.c
index 3345caf484..fd0552b237 100644
--- a/io.c
+++ b/io.c
@@ -8500,6 +8500,7 @@ argf_to_io(VALUE argf)
 static VALUE
 argf_eof(VALUE argf)
 {
+    next_argv();
     if (RTEST(ARGF.current_file)) {
 	if (ARGF.init_p == 0) return Qtrue;
 	next_argv();