diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ef2b89a52..8fd2d8480 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
     <listitem>
       <para>2009-05-10</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Shadow-4.1.3.1. Fixes
+          <ulink url="&lfs-ticket-root;2382">#2382</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Sed-4.2. Fixes
           <ulink url="&lfs-ticket-root;2389">#2389</ulink>.</para>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 0b09986a8..ea4f0fb6f 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -72,7 +72,7 @@ find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;</userinput></scr
     <command>convert-mans</command> script which was installed during the
     Man-DB package:</para>
 
-<screen><userinput remap="configure">for i in de es fi fr id it pt_BR; do
+<screen><userinput remap="configure">for i in de fi fr id it pt_BR; do
     convert-mans UTF-8 ISO-8859-1 man/${i}/*.?
 done
 
@@ -109,21 +109,21 @@ convert-mans UTF-8 ISO-8859-9 man/tr/*.?</userinput></screen>
     -without-selinux</userinput></screen>
 -->
 
-<screen><userinput remap="configure">./configure --sysconfdir=/etc</userinput></screen>
+<screen><userinput remap="configure">./configure --sysconfdir=/etc --without-libpam</userinput></screen>
 
-    <!-- <variablelist>
-      <title>The meaning of the configure options:</title>
+    <variablelist>
+      <title>The meaning of the configure option:</title>
 
       <varlistentry>
-        <term><parameter>-without-selinux</parameter></term>
+        <term><parameter>-without-libpam</parameter></term>
         <listitem>
-          <para>Support for selinux is enabled by default, but selinux is not
-          built in a base LFS system.  The <command>configure</command> script
-          will fail if this option is not used.</para>
+          <para>Support for PAM is enabled by default, but PAM is not
+          built in a base LFS system.  The compilation of
+          <command>login</command> will fail if this option is not used.</para>
         </listitem>
       </varlistentry>
 
-    </variablelist> -->
+    </variablelist>
 
     <para>Compile the package:</para>
 
diff --git a/packages.ent b/packages.ent
index 3532596ee..84309f3a2 100644
--- a/packages.ent
+++ b/packages.ent
@@ -440,10 +440,10 @@
 <!ENTITY sed-ch6-du "10 MB">
 <!ENTITY sed-ch6-sbu "0.2 SBU">
 
-<!ENTITY shadow-version "4.1.2.2">
-<!ENTITY shadow-size "1,658 KB">
+<!ENTITY shadow-version "4.1.3.1">
+<!ENTITY shadow-size "1,661 KB">
 <!ENTITY shadow-url "ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-&shadow-version;.tar.bz2">
-<!ENTITY shadow-md5 "3d26d990d4c3add1b7f8387eec1d1fde">
+<!ENTITY shadow-md5 "f90f51908e9c3a62ac0eb6b3043421de">
 <!ENTITY shadow-home "http://pkg-shadow.alioth.debian.org/">
 <!ENTITY shadow-ch6-du "28 MB">
 <!ENTITY shadow-ch6-sbu "0.3 SBU">