diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b7dcf0a3a..d41f5dfd3 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-30  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_floppy.cc (fhandler_dev_floppy::get_drive_info): Use
+	fhandler method to access majoer device number.  Add comment to
+	explain floppy weirdness.
+
 2005-09-30  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Also use
diff --git a/winsup/cygwin/fhandler_floppy.cc b/winsup/cygwin/fhandler_floppy.cc
index 96f25b189..84d3d0f88 100644
--- a/winsup/cygwin/fhandler_floppy.cc
+++ b/winsup/cygwin/fhandler_floppy.cc
@@ -46,8 +46,9 @@ fhandler_dev_floppy::get_drive_info (struct hd_geometry *geo)
   DWORD bytes_read = 0;
 
   /* Always try using the new EX ioctls first (>= XP).  If not available,
-     fall back to trying the old non-EX ioctls. */
-  if (wincap.has_disk_ex_ioctls () && pc.dev.major != DEV_FLOPPY_MAJOR)
+     fall back to trying the old non-EX ioctls.
+     Unfortunately the EX ioctls are not implemented in the floppy driver. */
+  if (wincap.has_disk_ex_ioctls () && get_major () != DEV_FLOPPY_MAJOR)
     {
       if (!DeviceIoControl (get_handle (),
 			    IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0,