diff --git a/ChangeLog b/ChangeLog
index 7a9825d93b..c809dbac30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 27 17:54:35 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/stringio/stringio.c (strio_each_byte): Return self instead
+	  of nil as the rdoc says.
+
 Tue May 27 13:14:53 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* enum.c (enum_to_a): Pass arguments through to #each().
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index fc589ef55d..b72f5a9a32 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -621,7 +621,7 @@ strio_each_byte(VALUE self)
 	char c = RSTRING_PTR(ptr->string)[ptr->pos++];
 	rb_yield(CHR2FIX(c));
     }
-    return Qnil;
+    return self;
 }
 
 /*