diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index 6c541e88f..765af53a1 100644
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-16  Corinna Vinschen  <corinna@vinschen.de>
+
+	* cygserver-config: Use numeric id 18 instead of "system" in chown.
+
 2014-04-07  Corinna Vinschen  <corinna@vinschen.de>
 
 	* process.cc (process::process): Only notice that signal_arrived is
diff --git a/winsup/cygserver/cygserver-config b/winsup/cygserver/cygserver-config
index f9515e71e..b8f441c3d 100755
--- a/winsup/cygserver/cygserver-config
+++ b/winsup/cygserver/cygserver-config
@@ -157,7 +157,7 @@ then
     exit 1
   fi
   chmod 664 "${SYSCONFDIR}/cygserver.conf"
-  chown system.544 "${SYSCONFDIR}/cygserver.conf"
+  chown 18.544 "${SYSCONFDIR}/cygserver.conf"
 fi
 
 # On NT ask if cygserver should be installed as service
@@ -189,7 +189,7 @@ then
       echo "To start it, call \`net start cygserver' or \`cygrunsrv -S cygserver'."
     fi
     touch "${LOCALSTATEDIR}/log/cygserver.log"
-    chown system.544 "${LOCALSTATEDIR}/log/cygserver.log"
+    chown 18.544 "${LOCALSTATEDIR}/log/cygserver.log"
   fi
 fi