diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c7906ecae..c56fc6ebf 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-20  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_disk_file.cc (fhandler_disk_file::fchmod): Fix test for
+	S_IFSOCK in mode bits.
+
 2008-05-20  Corinna Vinschen  <corinna@vinschen.de>
 
 	* path.cc (symlink_worker): Fix EA buffer size info given to
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index f51da1948..318123903 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -854,7 +854,7 @@ fhandler_disk_file::fchmod (mode_t mode)
     pc &= (DWORD) ~FILE_ATTRIBUTE_READONLY;
   else
     pc |= (DWORD) FILE_ATTRIBUTE_READONLY;
-  if (mode & S_IFSOCK)
+  if (S_ISSOCK (mode))
     pc |= (DWORD) FILE_ATTRIBUTE_SYSTEM;
 
   FILE_BASIC_INFORMATION fbi;