Index: general.ent
===================================================================
--- general.ent	(revision aee33b88b5b8b4490c4aa8e2cac85b9a69e6d5ab)
+++ general.ent	(revision 1f01e7007e2cbde0764ced11014e8379b3b8d3af)
@@ -39,5 +39,5 @@
 <!ENTITY heimdal-version              "0.6.3">
 <!ENTITY mitkrb-version               "1.4">
-<!ENTITY cyrus-sasl-version           "2.1.20">
+<!ENTITY cyrus-sasl-version           "2.1.21">
 <!ENTITY stunnel-version              "4.09">
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision aee33b88b5b8b4490c4aa8e2cac85b9a69e6d5ab)
+++ introduction/welcome/changelog.xml	(revision 1f01e7007e2cbde0764ced11014e8379b3b8d3af)
@@ -26,5 +26,6 @@
     
     <listitem>
-      <para>July 18th 2005 [randy]: Updated to Nail-11.24.</para>
+      <para>July 18th 2005 [randy]: Updated to Nail-11.24 and 
+      Cyrus-SASL-2.1.21.</para>
     </listitem>
 
Index: postlfs/security/cyrus-sasl.xml
===================================================================
--- postlfs/security/cyrus-sasl.xml	(revision aee33b88b5b8b4490c4aa8e2cac85b9a69e6d5ab)
+++ postlfs/security/cyrus-sasl.xml	(revision 1f01e7007e2cbde0764ced11014e8379b3b8d3af)
@@ -7,8 +7,8 @@
   <!ENTITY cyrus-sasl-download-http "http://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-&cyrus-sasl-version;.tar.gz ">
   <!ENTITY cyrus-sasl-download-ftp  "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-&cyrus-sasl-version;.tar.gz">
-  <!ENTITY cyrus-sasl-md5sum        "268ead27f4ac39bcfe17d9e38e0f2977">
-  <!ENTITY cyrus-sasl-size          "1.7 MB">
-  <!ENTITY cyrus-sasl-buildsize     "17 MB">
-  <!ENTITY cyrus-sasl-time          "0.28 SBU">
+  <!ENTITY cyrus-sasl-md5sum        "dde02db234dea892bee298390890502e">
+  <!ENTITY cyrus-sasl-size          "1.6 MB">
+  <!ENTITY cyrus-sasl-buildsize     "16 MB">
+  <!ENTITY cyrus-sasl-time          "0.3 SBU">
 ]>
 
@@ -92,13 +92,19 @@
 make</userinput></screen>
 
+    <para>This package does not come with a test suite. If you are planning
+    on using the GSSAPI authentication mechanism, it is recommended to test
+    it after installing the package using the sample server and client programs
+    which were built in the preceding step. Instructions for performing the
+    tests can be found at <ulink
+    url="http://www.linuxfromscratch.org/hints/downloads/files/cyrus-sasl.txt"/>.</para>
+
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 saslauthd/saslauthd.mdoc \
-    /usr/share/man/man8/saslauthd.8 &amp;&amp;
-install -v -d -m755 /usr/share/doc/cyrus-sasl-&cyrus-sasl-version; &amp;&amp;
+install -v -m644 saslauthd/saslauthd.8 /usr/share/man/man8 &amp;&amp;
+install -v -m755 -d /usr/share/doc/cyrus-sasl-&cyrus-sasl-version; &amp;&amp;
 install -v -m644 doc/{*.{html,txt,fig},ONEWS,TODO} \
     saslauthd/LDAP_SASLAUTHD /usr/share/doc/cyrus-sasl-&cyrus-sasl-version; &amp;&amp;
-install -v -d -m700 /var/lib/sasl</userinput></screen>
+install -v -m700 -d /var/lib/sasl</userinput></screen>
 
   </sect2>
@@ -120,9 +126,17 @@
     with <application>OpenLDAP</application>.</para>
 
+    <para><option>--enable-ldapdb</option>: This parameter enables the
+    LDAPDB authentication backend. There is a circular dependency with this
+    parameter which requires you to build the
+    <application>Cyrus SASL</application> package, then the
+    <application>OpenLDAP</application> package (with SASL support), then
+    finally building the <application>Cyrus SASL</application> package again
+    with this parameter.</para>
+
     <para><command>install -v -m644 ...</command>: These commands
     install documentation which is not installed by the
     <command>make install</command> command.</para>
 
-    <para><command>install -v -d -m700 /var/lib/sasl</command>: This directory
+    <para><command>install -v -m700 -d /var/lib/sasl</command>: This directory
     must exist when starting <command>saslauthd</command>. If you're not going
     to be running the daemon, you may omit the creation of this directory.</para>
@@ -154,5 +168,6 @@
       See <ulink
       url="file:///usr/share/doc/cyrus-sasl-&cyrus-sasl-version;/LDAP_SASLAUTHD"/>
-      for configuring <command>saslauthd</command> with LDAP.</para>
+      for configuring <command>saslauthd</command> with
+      <application>OpenLDAP</application>.</para>
 
     </sect3>
@@ -193,7 +208,7 @@
       <seglistitem>
         <seg>saslauthd, sasldblistusers2, and saslpasswd2</seg>
-        <seg>libjavasasl.so, libsasl2.so, and SASL plugins/Java
-        classes</seg>
-        <seg>/usr/include/sasl, /usr/lib/java, /usr/lib/sasl2,
+        <seg>libjavasasl.so, libsasl2.so, and numerous SASL plugins and
+        Java classes</seg>
+        <seg>/usr/include/sasl, /usr/lib/java/classes/sasl, /usr/lib/sasl2,
         /usr/share/doc/cyrus-sasl-&cyrus-sasl-version;, and /var/lib/sasl</seg>
       </seglistitem>
