diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 511503378..a49f03e65 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-18  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_disk_file.cc (fhandler_base::fstat_helper): Set st_rdev
+	to correct device number for fs_special devices.
+
 2010-08-16  Corinna Vinschen  <corinna@vinschen.de>
 
 	* include/cygwin/version.h: Bump DLL minor version number to 6.
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index a284b81f9..c860655d5 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -633,7 +633,7 @@ fhandler_base::fstat_helper (struct __stat64 *buf,
 	buf->st_mode |= S_IFREG;
       else
 	{
-	  buf->st_dev = dev ();
+	  buf->st_dev = buf->st_rdev = dev ();
 	  buf->st_mode = dev ().mode;
 	  buf->st_size = 0;
 	}
@@ -652,7 +652,7 @@ fhandler_base::fstat_helper (struct __stat64 *buf,
 	/* nothing */;
       else if (is_fs_special ())
 	{
-	  buf->st_dev = dev ();
+	  buf->st_dev = buf->st_rdev = dev ();
 	  buf->st_mode = dev ().mode;
 	  buf->st_size = 0;
 	}