diff --git a/ChangeLog b/ChangeLog
index 04b14208b8..744f7a36fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 14 22:52:35 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_sysread): should not raise at empty
+	  read.  a patch from Arthur Schreiber at [ruby-core:17245].
+
 Sat Jun 14 16:55:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (file_expand_path): no need to expand root path which has no
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 604ea87800..8b5abb3f62 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -1152,7 +1152,7 @@ static VALUE
 strio_sysread(int argc, VALUE *argv, VALUE self)
 {
     VALUE val = strio_read(argc, argv, self);
-    if (NIL_P(val) || RSTRING_LEN(val) == 0) {
+    if (NIL_P(val)) {
 	rb_eof_error();
     }
     return val;