Index: final-system/common/shadow.xml
===================================================================
--- final-system/common/shadow.xml	(revision 288217a9b60cef2a8b82c0e5db1c00a557c86efc)
+++ final-system/common/shadow.xml	(revision e7e4f53b8c724998f39be251b8148a1759df0a6c)
@@ -43,42 +43,63 @@
     </note>
 
-    <para os="p1">Shadow has selinux, pam, and auditing defaulted to on. The
-     following patch properly fixes this issue:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&shadow-configure_fix-patch;</userinput></screen>
-
     <para os="b">Prepare Shadow for compilation:</para>
 
-<screen os="c"><userinput>./configure --libdir=/lib --enable-shared</userinput></screen>
-
-    <para os="d">Disable the installation of the <command>groups</command>
+<screen os="c"><userinput>./configure --libdir=/lib --enable-shared \
+    --without-libpam --without-audit --without-selinux</userinput></screen>
+
+<para os="d">The meaning of the configure options:</para>
+
+  <variablelist os="e">
+    <varlistentry>
+      <term><parameter>--without-libpam</parameter></term>
+      <listitem><para>Support for Linux-PAM is enabled by default in Shadow,
+      however PAM is not installed on a base LFS system, so this switch
+      disables PAM support in Shadow. For instructions to install PAM and
+      link Shadow to it, you can look at
+      <ulink url="&blfs-root;view/svn/postlfs/shadow.html"/>.</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><parameter>--without-audit</parameter></term>
+      <listitem><para>Support for auditing is enabled by default, but a
+      a library that it needs is not installed in a base LFS system. This
+      switch disables auditing support.</para></listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><parameter>--without-selinux</parameter></term>
+      <listitem><para>Support for selinux is enabled by default, but selinux
+      is not built in a base LFS system and configure will fail without this
+      switch.</para></listitem>
+    </varlistentry>
+  </variablelist>
+
+    <para os="f">Disable the installation of the <command>groups</command>
     program and its man page, as Coreutils provides a better version:</para>
 
-<screen os="e"><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile
+<screen os="g"><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile
 sed -i '/groups/d' man/Makefile</userinput></screen>
 
-    <para os="f">Compile the package:</para>
-
-<screen os="g"><userinput>make</userinput></screen>
-
-    <para os="h">Install the package:</para>
-
-<screen os="i"><userinput>make install</userinput></screen>
-
-    <para id="shadow-limits-login_access" os="j">Shadow uses two files to configure
+    <para os="h">Compile the package:</para>
+
+<screen os="i"><userinput>make</userinput></screen>
+
+    <para os="j">Install the package:</para>
+
+<screen os="k"><userinput>make install</userinput></screen>
+
+    <para id="shadow-limits-login_access" os="l">Shadow uses two files to configure
     authentication settings for the system. Install these two configuration
     files:</para>
 
-    <indexterm zone="shadow-limits-login_access" os="k">
+    <indexterm zone="shadow-limits-login_access" os="m">
       <primary sortas="e-/etc/limits">/etc/limits</primary>
     </indexterm>
 
-    <indexterm zone="shadow-limits-login_access" os="l">
+    <indexterm zone="shadow-limits-login_access" os="n">
       <primary sortas="e-/etc/login.access">/etc/login.access</primary>
     </indexterm>
 
-<screen os="m"><userinput>cp etc/{limits,login.access} /etc</userinput></screen>
-
-    <para id="shadow-login_defs" os="n">Instead of using the default
+<screen os="o"><userinput>cp etc/{limits,login.access} /etc</userinput></screen>
+
+    <para id="shadow-login_defs" os="p">Instead of using the default
     <emphasis>crypt</emphasis> method, use the more secure
     <emphasis>MD5</emphasis> method of password encryption, which also allows
@@ -90,9 +111,9 @@
     while copying it to its destination:</para>
 
-    <indexterm zone="shadow-login_defs" os="o">
+    <indexterm zone="shadow-login_defs" os="q">
       <primary sortas="e-/etc/login.defs">/etc/login.defs</primary>
     </indexterm>
 
-    <note os="p">
+    <note os="r">
       <para>If you built Shadow with Cracklib support, insert the following into
       the <command>sed</command> given below:</para>
@@ -101,24 +122,24 @@
     </note>
 
-<screen os="q"><userinput>sed -e's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \
+<screen os="s"><userinput>sed -e's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \
     -e 's@/var/spool/mail@/var/mail@' \
     etc/login.defs &gt; /etc/login.defs</userinput></screen>
 
-    <para os="r">Move a misplaced program to its proper location:</para>
-
-<screen os="s"><userinput>mv /usr/bin/passwd /bin</userinput></screen>
-
-    <para os="t">Move Shadow's dynamic libraries to a more appropriate
+    <para os="t">Move a misplaced program to its proper location:</para>
+
+<screen os="u"><userinput>mv /usr/bin/passwd /bin</userinput></screen>
+
+    <para os="v">Move Shadow's dynamic libraries to a more appropriate
     location:</para>
 
-<screen os="u"><userinput>mv /lib/libshadow.*a /usr/lib
+<screen os="w"><userinput>mv /lib/libshadow.*a /usr/lib
 rm /lib/libshadow.so
 ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen>
 
-    <para os="v">The <option>-D</option> option of the <command>useradd</command>
+    <para os="x">The <option>-D</option> option of the <command>useradd</command>
     program requires the <filename class="directory">/etc/default</filename>
     directory for it to work properly:</para>
 
-<screen os="w"><userinput>install -d /etc/default</userinput></screen>
+<screen os="y"><userinput>install -d /etc/default</userinput></screen>
 
   </sect2>
Index: final-system/multilib/shadow-64bit.xml
===================================================================
--- final-system/multilib/shadow-64bit.xml	(revision 288217a9b60cef2a8b82c0e5db1c00a557c86efc)
+++ final-system/multilib/shadow-64bit.xml	(revision e7e4f53b8c724998f39be251b8148a1759df0a6c)
@@ -39,16 +39,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="shadow.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="shadow.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="shadow.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
-   --enable-shared</userinput></screen>
+   --enable-shared --without-libpam --without-audit --without-selinux</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -77,9 +69,9 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
+    href="shadow.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
@@ -109,9 +101,9 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="shadow.xml"
+    href="../common/shadow.xml"
     xpointer="xpointer(//*[@os='r'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="shadow.xml"
+    href="../common/shadow.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
@@ -119,4 +111,12 @@
     href="shadow.xml"
     xpointer="xpointer(//*[@os='t'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="shadow.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="shadow.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
 
 <screen os="u"><userinput>mv /lib64/libshadow.*a /usr/lib64
@@ -126,9 +126,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
+    xpointer="xpointer(//*[@os='x'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
+    xpointer="xpointer(//*[@os='y'])"/>
 
   </sect2>
Index: final-system/multilib/shadow-n32.xml
===================================================================
--- final-system/multilib/shadow-n32.xml	(revision 288217a9b60cef2a8b82c0e5db1c00a557c86efc)
+++ final-system/multilib/shadow-n32.xml	(revision e7e4f53b8c724998f39be251b8148a1759df0a6c)
@@ -40,16 +40,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="shadow.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="shadow.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="shadow.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen os="c"><userinput>CC="gcc ${BUILDN32}" ./configure --libdir=/lib32 \
-   --enable-shared</userinput></screen>
+   --enable-shared --without-libpam --without-audit --without-selinux</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -79,9 +71,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="shadow.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="shadow.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
+    xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -89,5 +81,13 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-<screen os="u"><userinput>mv /lib32/libshadow.*a /usr/lib32
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="shadow.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="shadow.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+
+<screen os="w"><userinput>mv /lib32/libshadow.*a /usr/lib32
 rm /lib32/libshadow.so
 ln -sf ../../lib32/libshadow.so.0 /usr/lib32/libshadow.so</userinput></screen>
Index: final-system/multilib/shadow.xml
===================================================================
--- final-system/multilib/shadow.xml	(revision 288217a9b60cef2a8b82c0e5db1c00a557c86efc)
+++ final-system/multilib/shadow.xml	(revision e7e4f53b8c724998f39be251b8148a1759df0a6c)
@@ -29,16 +29,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
 <screen os="c"><userinput>CC="gcc ${BUILD32}" ./configure --libdir=/lib \
-   --enable-shared</userinput></screen>
+   --enable-shared --without-libpam --without-audit --without-selinux</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -68,9 +60,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
+    xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -81,4 +73,12 @@
     href="../common/shadow.xml"
     xpointer="xpointer(//*[@os='u'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/shadow.xml"
+    xpointer="xpointer(//*[@os='w'])"/>
 
   </sect2>
Index: general.ent
===================================================================
--- general.ent	(revision 288217a9b60cef2a8b82c0e5db1c00a557c86efc)
+++ general.ent	(revision e7e4f53b8c724998f39be251b8148a1759df0a6c)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY version "CLFS-SVN-20060115">
+<!ENTITY version "CLFS-SVN-20060119">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64-Multilib">
@@ -15,5 +15,5 @@
 <!ENTITY version-alpha "&version;-ALPHA">
 
-<!ENTITY releasedate "January 15, 2006">
+<!ENTITY releasedate "January 19, 2006">
 <!ENTITY milestone "0.1">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
Index: introduction/common/changelog.xml
===================================================================
--- introduction/common/changelog.xml	(revision 288217a9b60cef2a8b82c0e5db1c00a557c86efc)
+++ introduction/common/changelog.xml	(revision e7e4f53b8c724998f39be251b8148a1759df0a6c)
@@ -38,4 +38,13 @@
 
     <listitem>
+      <para>January 19, 2006</para> 
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Removed patch from shadow instructions.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 13, 2006</para>
       <itemizedlist>
Index: materials/common/patches.xml
===================================================================
--- materials/common/patches.xml	(revision 288217a9b60cef2a8b82c0e5db1c00a557c86efc)
+++ materials/common/patches.xml	(revision e7e4f53b8c724998f39be251b8148a1759df0a6c)
@@ -171,12 +171,4 @@
     </varlistentry>
 
-    <varlistentry os="p21">
-      <term>Shadow Configure Fixes Patch - 3.0 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;shadow/&shadow-configure_fix-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry os="p22">
       <term>Sysklogd Fixes Patch - 28 KB:</term>
