diff --git a/ChangeLog b/ChangeLog
index 4997e419d3..910b333cd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 27 20:02:09  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* io.c (rb_io_fwrite): check all case errno != 0 [ruby-dev:23648]
+
 Thu May 27 15:54:02 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/ftp.rb (MDTM_REGEXP): fix for demon's ftp server.
@@ -8,7 +12,7 @@ Thu May 27 14:53:13 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 	* io.c (rb_io_fwrite): workaround for bcc32's fwrite bug.
 	  add errno checking.  [ruby-dev:23627]
 
-	* io.c (rb_io_fwrite): should check if errnro == ENOENT, too.
+	* io.c (rb_io_fwrite): should check if errno == ENOENT, too.
 
 Thu May 27 11:25:03 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
diff --git a/io.c b/io.c
index ecc297117d..7f6b8f438e 100644
--- a/io.c
+++ b/io.c
@@ -411,7 +411,7 @@ rb_io_fwrite(ptr, len, f)
     while (errno = 0, ptr += (r = fwrite(ptr, 1, n, f)), (n -= r) > 0) {
 	if (ferror(f)
 #if defined __BORLANDC__
-	    || errno == EBADF || errno == ENOENT
+	    || errno
 #endif
 	) {
 #ifdef __hpux