diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f2c80e96d..7dc1cf277 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-29  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_disk_file.cc (fhandler_disk_file::fchmod): Allow to report
+	success on systems with ntsec and ntea set.
+
 2004-08-28  Pierre Humblet <pierre.humblet@ieee.org>
 
 	* fhandler.cc (fhandler_base::write): In the lseek_bug case, set EOF 
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 81ce2d88c..ebf92772a 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -409,7 +409,7 @@ fhandler_disk_file::fchmod (mode_t mode)
 
   if (!SetFileAttributes (pc, pc))
     __seterrno ();
-  else if (!allow_ntsec)
+  else if (!allow_ntsec || !pc.has_acls ())
     /* Correct NTFS security attributes have higher priority */
     res = 0;