diff --git a/ChangeLog b/ChangeLog
index 62d2ac782e..f3b8fe3bbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu May 27 22:34:27 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_read): call ReadFile() with len = 0 before
+	  reading really on console, because the first ReadFile() call after
+	  PeekConsoleInput() always returns broken data. (Windows's bug).
+	  [ruby-core:29018]
+
 Thu May 27 12:42:23 2010  Akinori MUSHA  <knu@iDaemons.org>
 
 	* LGPL: Removed.  We no longer have LGPL'd source files in our
diff --git a/win32/win32.c b/win32/win32.c
index 506a960d36..570ba2cf46 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -5032,6 +5032,7 @@ rb_w32_read(int fd, void *buf, size_t size)
     size_t len;
     size_t ret;
     OVERLAPPED ol, *pol = NULL;
+    int start = 0;
 
     if (is_socket(sock))
 	return rb_w32_recv(fd, buf, size, 0);
@@ -5054,8 +5055,17 @@ rb_w32_read(int fd, void *buf, size_t size)
 
     ret = 0;
   retry:
-    /* get rid of console writing bug */
-    len = (_osfile(fd) & FDEV) ? min(16 * 1024, size) : size;
+    /* get rid of console reading bug */
+    if (is_console(_osfhnd(fd))) {
+	if (start)
+	    len = min(16 * 1024, size);
+	else {
+	    len = 0;
+	    start = 1;
+	}
+    }
+    else
+	len = size;
     size -= len;
 
     /* if have cancel_io, use Overlapped I/O */