diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 22d1a8b6b..e300ff6c6 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-11  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_disk_file.cc (fhandler_disk_file::fchmod): Fix typo in
+	mask computation.
+
 2015-04-10  Corinna Vinschen  <corinna@vinschen.de>
 
 	* include/cygwin/version.h (CYGWIN_VERSION_DLL_MAJOR): Bump to 2000.
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index abc4b4134..2b30801bc 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -906,9 +906,9 @@ fhandler_disk_file::fchmod (mode_t mode)
 	      aclp[0].a_perm = (mode >> 6) & S_IRWXO;
 	      if (nentries > MIN_ACL_ENTRIES
 		  && (idx = searchace (aclp, nentries, CLASS_OBJ)) >= 0)
-		aclp[idx].a_perm = (mode >> 6) & S_IRWXO;
+		aclp[idx].a_perm = (mode >> 3) & S_IRWXO;
 	      else
-		aclp[1].a_perm = (mode >> 6) & S_IRWXO;
+		aclp[1].a_perm = (mode >> 3) & S_IRWXO;
 	      if ((idx = searchace (aclp, nentries, OTHER_OBJ)) >= 0)
 		aclp[idx].a_perm = mode & S_IRWXO;
 	      if (pc.isdir ())