diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6d11117c9..f8d385d14 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -114,6 +114,9 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>August 30th, 2005 [matt]: Upgrade to shadow-2.0.12</para>
+</listitem>
+
 <listitem><para>August 28th, 2005 [jhuntwork]: Adjusted tar commands in Bash
 and Glibc chapter six builds for consistency</para></listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 8a756395b..72e7b4444 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -347,7 +347,7 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Shadow (&shadow-version;) - 1,031 KB:</term>
+<term>Shadow (&shadow-version;) - 1,057 KB:</term>
 <listitem>
 <para><ulink url="ftp://ftp.pld.org.pl/software/shadow/"/></para>
 <note><para>Shadow (&shadow-version;) may no longer be available at the listed
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 280945a42..a0a64b899 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -38,17 +38,7 @@ prior to building Shadow. Then add <parameter>--with-libcrack</parameter> to the
 
 <para>Prepare Shadow for compilation:</para>
 
-<screen><userinput>./configure --libdir=/lib --enable-shared --enable-shadowgrp</userinput></screen>
-
-<para>The meaning of the new configure options:</para>
-<variablelist>
-<varlistentry>
-<term><parameter>--enable-shadowgrp</parameter></term>
-<listitem><para>This version of Shadow defaults to not enabling
-shadow group functionality, which will cause <command>grpconv</command> to fail.
-</para></listitem>
-</varlistentry>
-</variablelist>
+<screen><userinput>./configure --libdir=/lib --enable-shared</userinput></screen>
 
 <para>Disable the installation of the <command>groups</command> program and its man page, as Coreutils provides a better version:</para>
 
diff --git a/general.ent b/general.ent
index 0b0963a62..eee929901 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20050828">
-<!ENTITY releasedate "August 28, 2005">
+<!ENTITY version "SVN-20050831">
+<!ENTITY releasedate "August 31, 2005">
 <!ENTITY milestone "6.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
@@ -71,7 +71,7 @@
 <!ENTITY psmisc-version "21.6">
 <!ENTITY readline-version "5.0">
 <!ENTITY sed-version "4.1.4">
-<!ENTITY shadow-version "4.0.11.1">
+<!ENTITY shadow-version "4.0.12">
 <!ENTITY sysklogd-version "1.4.1">
 <!ENTITY sysvinit-version "2.86">
 <!ENTITY tar-version "1.15.1">