diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 5436c64b9..98fc72cdb 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-10  Michael DePaulo  <mikedep333@gmail.com>
+
+	* ntsec.xml (ntsec-mapping-samba): Clarify Samba file server setup.
+
 2014-12-10  Corinna Vinschen  <corinna@vinschen.de>
 
 	* faq-using.xml (faq.using.bloda): Add Lenovo RapidBoot Shield to
diff --git a/winsup/doc/ntsec.xml b/winsup/doc/ntsec.xml
index 500f8b780..ed8948072 100644
--- a/winsup/doc/ntsec.xml
+++ b/winsup/doc/ntsec.xml
@@ -2042,10 +2042,9 @@ by child processes.
 <sect3 id="ntsec-mapping-samba"><title id="ntsec-mapping-samba.title">Samba account mapping</title>
 
 <para>
-A fully set up Samba with domain integration is running winbindd to
-map Window SIDs to artificially created UNIX uids and gids, and this
-mapping is transparent within the domain, so Cygwin doesn't have to do
-anything special.
+A fully set up Samba file server with domain integration is running winbindd to
+map Window SIDs to artificially created UNIX uids and gids, and this mapping is
+transparent within the domain, so Cygwin doesn't have to do anything special.
 </para>
 
 <para>