diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d303251f0..5e6652bfb 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -46,7 +46,7 @@ First a summary, then a detailed log.</para>
 <listitem><para>Procps 3.2.5</para></listitem>
 <listitem><para>Psmisc 21.6</para></listitem>
 <listitem><para>Sed 4.1.4</para></listitem>
-<listitem><para>Shadow 4.0.7</para></listitem>
+<listitem><para>Shadow 4.0.9</para></listitem>
 <listitem><para>Sysvinit 2.86</para></listitem>
 <listitem><para>Tar 1.15.1</para></listitem>
 <listitem><para>Texinfo 4.8</para></listitem>
@@ -65,7 +65,6 @@ First a summary, then a detailed log.</para>
 <listitem><para>glibc-2.3.4-fix_test-1.patch</para></listitem>
 <listitem><para>gzip-1.3.5-security_fixes-1.patch</para></listitem>
 <listitem><para>Hotplug 2004_09_23</para></listitem>
-<listitem><para>shadow-4.0.7-fix_lastlog-1.patch</para></listitem>
 <listitem><para>sysklogd-1.4.1-fixes-1.patch</para></listitem>
 <listitem><para>tar-1.15.1-sparse_fix-1.patch</para></listitem>
 <listitem><para>util-linux-2.12p-cramfs-1.patch</para></listitem>
@@ -86,6 +85,9 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>June 22nd, 2005 [archaic]: Upgraded shadow to 4.0.9. Removed
+lastlog patch.</para></listitem>
+
 <listitem><para>June 21st, 2005 [archaic]: Removed --with-included-regex from
 chapter05/grep since there seems to no longer be a valid reason to use it and
 the explanation of it was incorrect.</para></listitem>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 2e8960741..b1b96411b 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -29,14 +29,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 2bb6f3e27..27465357a 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "TESTING-20050621">
-<!ENTITY releasedate "June 21, 2005">
+<!ENTITY version "TESTING-20050622">
+<!ENTITY releasedate "June 22, 2005">
 <!ENTITY milestone "6.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
@@ -67,7 +67,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">