diff --git a/ChangeLog b/ChangeLog
index 092bfbf4c3..d70eee806c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+<<<<<<< .mine
+Tue May 27 13:12:37 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* io.c (Init_IO): Define ARGF.{lines,bytes,chars}.
+
 Tue May 27 12:06:37 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* file.c (BUFCHECK): wrong condition. [ruby-core:16921]
diff --git a/io.c b/io.c
index 6ccd0c1338..7d4cb2cad5 100644
--- a/io.c
+++ b/io.c
@@ -7650,6 +7650,9 @@ Init_IO(void)
     rb_define_method(rb_cARGF, "each_line",  argf_each_line, -1);
     rb_define_method(rb_cARGF, "each_byte",  argf_each_byte, 0);
     rb_define_method(rb_cARGF, "each_char",  argf_each_char, 0);
+    rb_define_method(rb_cARGF, "lines", argf_each_line, -1);
+    rb_define_method(rb_cARGF, "bytes", argf_each_byte, 0);
+    rb_define_method(rb_cARGF, "chars", argf_each_char, 0);
 
     rb_define_method(rb_cARGF, "read",  argf_read, -1);
     rb_define_method(rb_cARGF, "readpartial",  argf_readpartial, -1);