diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index af773f90a..349fa41bb 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -79,6 +79,7 @@ First a summary, then a detailed log.</para>
 <listitem><para>bash-3.0-display_wrap-1.patch</para></listitem>
 <listitem><para>iproute2-2.6.11-050330-remove_db-1.patch</para></listitem>
 <listitem><para>man-1.5o1-80cols-1.patch</para></listitem>
+<listitem><para>shadow-4.0.7-fix_lastlog-1.patch</para></listitem>
 <listitem><para>sysklogd-1.4.1-kernel_headers-1.patch</para></listitem>
 <listitem><para>sysvinit-2.85-proclen-1.patch</para></listitem>
 <listitem><para>texinfo-4.7-segfault-1.patch</para></listitem>
@@ -87,6 +88,8 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>June 12th, 2005 [matt]: Upgraded to shadow-4.0.9.</para></listitem>
+
 <listitem><para>June 12th, 2005 [matt]: Upgraded to gettext-0.14.5.</para></listitem>
 
 <listitem><para>June 12th, 2005 [matt]: Upgraded to perl-5.8.7.</para></listitem>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 1ff9adab4..99bbe209d 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -340,7 +340,7 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Shadow (&shadow-version;) - 996 KB:</term>
+<term>Shadow (&shadow-version;) - 1,080 KB:</term>
 <listitem>
 <para><ulink url="ftp://ftp.pld.org.pl/software/shadow/"/></para>
 </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 451f1b932..fe14a70c8 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -121,13 +121,6 @@ needed to build an LFS system:</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>Shadow Lastlog Fix Patch - 1 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;&shadow-lastlog-patch;"/></para>
-</listitem>
-</varlistentry>
-
 <varlistentry>
 <term>Sysklogd Fixes Patch - 27 KB:</term>
 <listitem>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 9c5bb264c..2ee7a57a6 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -31,14 +31,6 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, and Sed</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Shadow</title>
 
-<para>Shadow fails to update the time of last login as noted by 
-<command>lastlog</command> when logging into a regular console. 
-The Port (tty) column does get updated. Remote logins and 
-<command>xterm</command> logins seem to not be broken; just console.
-The following patch properly fixes this issue:</para>
-
-<screen><userinput>patch -Np1 -i ../shadow-&shadow-version;-fix_lastlog-1.patch</userinput></screen>
-
 <para>Prepare Shadow for compilation:</para>
 
 <screen><userinput>./configure --libdir=/lib --enable-shared</userinput></screen>
diff --git a/general.ent b/general.ent
index 81e4ffa2b..d8f4f97e6 100644
--- a/general.ent
+++ b/general.ent
@@ -66,7 +66,7 @@
 <!ENTITY psmisc-version "21.6">
 <!ENTITY readline-version "5.0">
 <!ENTITY sed-version "4.1.4">
-<!ENTITY shadow-version "4.0.7">
+<!ENTITY shadow-version "4.0.9">
 <!ENTITY sysklogd-version "1.4.1">
 <!ENTITY sysvinit-version "2.86">
 <!ENTITY tar-version "1.15.1">