Index: postlfs/security/linux-pam.xml
===================================================================
--- postlfs/security/linux-pam.xml	(revision fd680fb0e5605ec33f3edfcab9e7c1f99461b088)
+++ postlfs/security/linux-pam.xml	(revision c03a8bd87fec0c65d67e2d76ab2cfc8bc9b55d0d)
@@ -7,7 +7,7 @@
   <!ENTITY linux-pam-download-http "http://www.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-&linux-pam-version;.tar.bz2">
   <!ENTITY linux-pam-download-ftp  "ftp://ftp.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-&linux-pam-version;.tar.bz2">
-  <!ENTITY linux-pam-md5sum        "267ea71253615342261f9fc486d06647">
-  <!ENTITY linux-pam-size          "783 KB">
-  <!ENTITY linux-pam-buildsize     "19.8 MB">
+  <!ENTITY linux-pam-md5sum        "385458dfb4633071594e255a6ebec9da">
+  <!ENTITY linux-pam-size          "872 KB">
+  <!ENTITY linux-pam-buildsize     "18 MB">
   <!ENTITY linux-pam-time          "0.5 SBU">
   <!ENTITY linux-pam-docs-download "http://www.kernel.org/pub/linux/libs/pam/pre/doc/Linux-PAM-&linux-pam-version;-docs.tar.bz2">
@@ -68,16 +68,15 @@
     <bridgehead renderas="sect3">Linux-PAM Dependencies</bridgehead>
 
-    <!-- Moved to optional after discussion on BLFS-Dev
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="cracklib"/></para>
-
-    -->
-
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="cracklib"/>,
+    <para role="optional"><xref linkend="cracklib"/> and
     <!-- <xref linkend="db"/> (for the pam_userdb module), -->
-    <ulink url="http://www.prelude-ids.org/">Prelude</ulink>, and
-    <ulink url="http://sourceforge.net/projects/sgmltools-lite/">sgmltools-lite</ulink></para>
+    <ulink url="http://www.prelude-ids.org/">Prelude</ulink></para>
+
+    <bridgehead renderas="sect4">Optional (To {,Re}build the Documentation)</bridgehead>
+    <para role="optional"><xref linkend="libxslt"/>,
+    <xref linkend="DocBook"/>,
+    <xref linkend="docbook-xsl"/>,
+    <xref linkend="w3m"/>, and
+    <xref linkend="fop"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -89,9 +88,7 @@
     <title>Installation of Linux-PAM</title>
 
-    <para>If you downloaded the documentation, unpack the tarball into the
-    <filename class='directory'>doc</filename> directory of the source
-    tree:</para>
-
-<screen><userinput>tar -xf ../Linux-PAM-&linux-pam-version;-docs.tar.bz2 -C doc</userinput></screen>
+    <para>If you downloaded the documentation, unpack the tarball from the
+    same top-level directory you unpacked the source tarball from. The files
+    will unpack into the correct directories of the source tree.</para>
 
     <para>Install <application>Linux-PAM</application> by
@@ -101,9 +98,11 @@
             --sbindir=/lib/security \
             --enable-securedir=/lib/security \
-            --enable-docdir=/usr/share/doc/Linux-PAM-&linux-pam-version; \
+            --docdir=/usr/share/doc/Linux-PAM-&linux-pam-version; \
             --enable-read-both-confs &amp;&amp;
 make</userinput></screen>
 
-    <para>The test suite will not provide meaningful results until the package
+    <para>To test the results, issue <command>make check</command>.</para>
+
+    <!-- <para>The test suite will not provide meaningful results until the package
     has been installed and configured. If, after installing the package and
     creating a minimum configuration as shown below in the 'other' example,
@@ -118,5 +117,5 @@
       <application>Shadow</application> instructions to test the new setup. All
       the tests should pass.</para>
-    </tip>
+    </tip> -->
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
@@ -126,9 +125,9 @@
 mv -v /lib/security/pam_tally /sbin &amp;&amp;
 mv -v /usr/lib/libpam*.so.0* /lib &amp;&amp;
-ln -v -sf ../../lib/libpam.so.0.81.3 /usr/lib/libpam.so &amp;&amp;
+ln -v -sf ../../lib/libpam.so.0.81.6 /usr/lib/libpam.so &amp;&amp;
 ln -v -sf ../../lib/libpamc.so.0.81.0 /usr/lib/libpamc.so &amp;&amp;
 ln -v -sf ../../lib/libpam_misc.so.0.81.2 /usr/lib/libpam_misc.so</userinput></screen>
 
-    <para>If you downloaded the documentation, install it using the following
+    <!-- <para>If you downloaded the documentation, install it using the following
     command:</para>
 
@@ -136,5 +135,5 @@
 do
     cp -v -R doc/$DOCTYPE /usr/share/doc/Linux-PAM-&linux-pam-version;
-done</userinput></screen>
+done</userinput></screen> -->
 
   </sect2>
@@ -157,5 +156,5 @@
     <filename class='directory'>/lib/security</filename>.</para>
 
-    <para><parameter>--enable-docdir=...</parameter>: This parameter results in
+    <para><parameter>--docdir=...</parameter>: This parameter results in
     the documentation being installed in a versioned directory name.</para>
 
