diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9f05483a0..4768c0461 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-17  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_disk_file.cc (fhandler_disk_file::utimes): Handle opening
+	directories under 9x gracefully.
+
 2005-03-17  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_socket.cc (fhandler_socket::connect): Always set sun_path
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index f8d708e56..7842bcafa 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -806,15 +806,14 @@ fhandler_disk_file::utimes (const struct timeval *tvp)
       if (!open (O_WRONLY | O_BINARY, 0))
 	{
 	  syscall_printf ("Opening file failed");
-	  __seterrno ();
-	  if (pc.isdir ()) /* What we can do with directories more? */
-	    return 0;
-	    
 	  __seterrno ();
 	  return -1;
 	}
     }
 
+  if (nohandle ())	/* Directory query_open on 9x. */
+    return 0;
+
   gettimeofday (&tmp[0], 0);
   if (!tvp)
     {