diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ee3e18030..246779223 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-28  Pierre Humblet  <Pierre.Humblet@ieee.org>
+
+	* fhandler_disk_file.cc (fhandler_disk_file::fchmod): Only try to open
+	the file if it uses an acl.
+
 2004-05-28  Pierre Humblet  <Pierre.Humblet@ieee.org>
 
 	* path.cc (chdir): Always use the normalized_path as posix_cwd, except
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 194f64602..81ce2d88c 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -381,7 +381,7 @@ fhandler_disk_file::fchmod (mode_t mode)
   if (wincap.has_security ())
     {
       enable_restore_privilege ();
-      if (!get_io_handle ())
+      if (!get_io_handle () && pc.has_acls ())
 	{
 	  query_open (query_write_control);
 	  if (!(oret = open_fs (O_BINARY, 0)))