diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index d0cf692b4..31d74eed0 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-21  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_floppy.cc (fhandler_dev_floppy::raw_read): Drop
+	initialization of bytes_to_read.  Set bytes_to_read to len in
+	non-buffered case.  Call read_bytes correctly with bytes_to_read
+	instead of len.
+
 2008-11-21  Corinna Vinschen  <corinna@vinschen.de>
 
 	* mmap.cc (MapView): Add NT status to debug output.
diff --git a/winsup/cygwin/fhandler_floppy.cc b/winsup/cygwin/fhandler_floppy.cc
index 1357515aa..4368c5396 100644
--- a/winsup/cygwin/fhandler_floppy.cc
+++ b/winsup/cygwin/fhandler_floppy.cc
@@ -245,7 +245,7 @@ fhandler_dev_floppy::raw_read (void *ptr, size_t& ulen)
 {
   DWORD bytes_read = 0;
   DWORD read2;
-  DWORD bytes_to_read = 0;
+  DWORD bytes_to_read;
   int ret;
   size_t len = ulen;
   char *tgt;
@@ -341,9 +341,10 @@ fhandler_dev_floppy::raw_read (void *ptr, size_t& ulen)
   else
     {
       _off64_t current_position = get_current_position ();
+      bytes_to_read = len;
       if (current_position + bytes_to_read >= drive_size)
 	bytes_to_read = drive_size - current_position;
-      if (bytes_to_read && !read_file (p, len, &bytes_read, &ret))
+      if (bytes_to_read && !read_file (p, bytes_to_read, &bytes_read, &ret))
 	{
 	  if (!IS_EOM (ret))
 	    {