diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 7c1dfc921..db158ead2 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-18  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* mount.cc (mount_info::add_item): Avoid using any-old '/' as
+	indicating root.
+
 2009-05-18  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	* mount.cc (mount_info::got_usr_bin): Mark as NO_COPY.
diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc
index f6e4bace7..7c7f58a7b 100644
--- a/winsup/cygwin/mount.cc
+++ b/winsup/cygwin/mount.cc
@@ -1301,7 +1301,7 @@ mount_info::add_item (const char *native, const char *posix,
   if (strcmp (posixtmp, "/usr/lib") == 0)
     got_usr_lib = true;
 
-  if (posixtmp[0] == '/' && posixtmp[1] == '\0')
+  if (posixtmp[0] == '/' && posixtmp[1] == '\0' && !(mountflags & MOUNT_CYGDRIVE))
     root_idx = i;
 
   mount[i].init (nativetmp, posixtmp, mountflags);