diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 5d8d06b34..58e139679 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-03  Corinna Vinschen  <corinna@vinschen.de>
+
+	* syscalls.cc (fhandler_base::stat_fixup): Replace string comparison
+	with new device::is_dev_resident() call.
+
 2012-04-02  Christopher Faylor  <me.cygwin2012@cgf.cx>
 
 	* devices.h (lives_in_dev): New field.
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index e70bb9772..3ea4a6f8b 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -1601,7 +1601,7 @@ fhandler_base::stat_fixup (struct __stat64 *buf)
      assuming that /dev doesn't change over the lifetime of a process. */
   if (!buf->st_dev)
     {
-      if (!strncmp (dev ().name, "/dev/", 5))
+      if (dev ().is_dev_resident ())
 	{
 	  if (!dev_st_inited)
 	    {