diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 9f57e4e43..52cb6c827 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-02  Corinna Vinschen  <corinna@vinschen.de>
+
+	* cygserver.sgml: Document new feature to store hidden passwords
+	for seteuid.
+
 2008-12-02  Corinna Vinschen  <corinna@vinschen.de>
 
 	* ntsec.sgml: Finishing up changes for 1.7.
diff --git a/winsup/doc/cygserver.sgml b/winsup/doc/cygserver.sgml
index 2f34bbbd7..e34671358 100644
--- a/winsup/doc/cygserver.sgml
+++ b/winsup/doc/cygserver.sgml
@@ -17,6 +17,14 @@
   <listitem><para>XSI IPC Message Queues.</para></listitem>
   <listitem><para>XSI IPC Semaphores.</para></listitem>
   <listitem><para>XSI IPC Shared Memory.</para></listitem>
+  <listitem><para>Allows non-privileged users to store obfuscated
+  passwords in the registry to be used by <command>setuid</command> and
+  <command>seteuid</command> calls to create user tokens with network
+  credentials.  This service is used by <command><link
+  linkend="passwd">passwd</link> -R</command>.  Using the stored
+  passwords in <command>set(e)uid</command> does not require running
+  Cygserver.  For details, see <xref linkend="ntsec-nopasswd3"></xref>.
+  </para></listitem>
 </itemizedlist>
 
 </sect2>