Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 7887e3c8087ca84934abd8a56bfe9a2c12b76ff2)
+++ introduction/welcome/changelog.xml	(revision c6bdcb00dd388bbcce88c299e27ea69efae790a3)
@@ -46,4 +46,14 @@
       <itemizedlist>
         <listitem>
+          <para>[randy] - Added a note to the CrackLib instructions advising
+          to reinstall Shadow if you need strong password support without
+          installing Linux-PAM.</para>
+        </listitem>
+        <listitem>
+          <para>[randy] - Modified the Shadow instructions to reflect that
+          it needs to be reinstalled (and provided the modified commands) if
+          CrackLib is installed without Linux-PAM.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated to CrackLib-2.8.9.</para>
         </listitem>
Index: postlfs/security/cracklib.xml
===================================================================
--- postlfs/security/cracklib.xml	(revision 7887e3c8087ca84934abd8a56bfe9a2c12b76ff2)
+++ postlfs/security/cracklib.xml	(revision c6bdcb00dd388bbcce88c299e27ea69efae790a3)
@@ -154,4 +154,15 @@
 <screen><userinput>make test</userinput></screen>
 
+    <important>
+      <para>If you are installing <application>CrackLib</application> after
+      your LFS system has been completed and you have the
+      <application>Shadow</application> package installed, you must
+      reinstall <xref linkend="shadow"/> if you wish to provide strong
+      password support on your system. If you are now going to install the
+      <xref linkend="linux-pam"/> package, you may disregard this note as
+      <application>Shadow</application> will be reinstalled after the
+      <application>Linux-PAM</application> installation.</para>
+    </important>
+
   </sect2>
 
Index: postlfs/security/shadow.xml
===================================================================
--- postlfs/security/shadow.xml	(revision 7887e3c8087ca84934abd8a56bfe9a2c12b76ff2)
+++ postlfs/security/shadow.xml	(revision c6bdcb00dd388bbcce88c299e27ea69efae790a3)
@@ -36,7 +36,10 @@
     <para><application>Shadow</application> was indeed installed in LFS and
     there is no reason to reinstall it unless you installed
-    <application>Linux-PAM</application>. If you did install
-    <application>Linux-PAM</application>, reinstalling
-    <application>Shadow</application> will allow programs such as
+    <application>CrackLib</application> or
+    <application>Linux-PAM</application> after your LFS system was completed.
+    If you have installed <application>CrackLib</application> after LFS, then
+    reinstalling <application>Shadow</application> will enable strong password
+    support. If you have installed <application>Linux-PAM</application>,
+    reinstalling <application>Shadow</application> will allow programs such as
     <command>login</command> and <command>su</command> to utilize PAM.</para>
 
@@ -74,5 +77,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="linux-pam"/></para>
+    <para role="required"><xref linkend="linux-pam"/> and/or
+    <xref linkend="cracklib"/></para>
 
   </sect2>
@@ -80,4 +84,17 @@
   <sect2 role="installation">
     <title>Installation of Shadow</title>
+
+    <important>
+      <para>The installation shown below is for a situation where
+      <application>Linux-PAM</application> has been installed (with or
+      without a <application>CrackLib</application> installation) and
+      <application>Shadow</application> is being reinstalled to support the
+      <application>Linux-PAM</application> installation. If you are
+      reinstalling <application>Shadow</application> to provide strong
+      password support via the <application>CrackLib</application> library
+      and you have not installed <application>Linux-PAM</application>, ensure
+      you replace the <parameter>--with-libpam --without-libcrack</parameter>
+      parameters with <parameter>--with-libcrack</parameter>.</para>
+    </important>
 
     <para>Reinstall <application>Shadow</application> by running the following
