diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 17b387b70..4957bbafe 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-08  Corinna Vinschen  <corinna@vinschen.de>
+
+	* path.cc (symlink_info::check): Return with error set to ENOENT if
+	STATUS_NO_MEDIA_IN_DEVICE is returned.
+
 2009-06-07  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	* cygheap.h (mini_cygheap): New struct.
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 63850d394..7477ac5c9 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -2268,7 +2268,8 @@ symlink_info::check (char *path, const suffix_info *suffixes, unsigned opt,
 	     error in get_nt_native_path.  Both status codes are deliberately
 	     not tested here unless proved necessary. */
 	  if (status == STATUS_OBJECT_PATH_NOT_FOUND
-	      || status == STATUS_OBJECT_NAME_INVALID)
+	      || status == STATUS_OBJECT_NAME_INVALID
+	      || status == STATUS_NO_MEDIA_IN_DEVICE)
 	    {
 	      set_error (ENOENT);
 	      goto file_not_symlink;