diff --git a/Attic/appendixc/packages.xml b/Attic/appendixc/packages.xml
index ceabc7faf..f0ed41ae3 100644
--- a/Attic/appendixc/packages.xml
+++ b/Attic/appendixc/packages.xml
@@ -58,7 +58,6 @@ package quicker.</para>
 &ac-procps;
 &ac-psmisc;
 &ac-shadowpwd;
-&ac-shadowpwd-patch;
 &ac-sysklogd;
 &ac-sysvinit;
 &ac-utillinux;
diff --git a/Attic/appendixc/shadowpwd-patch.xml b/Attic/appendixc/shadowpwd-patch.xml
deleted file mode 100644
index 53081833e..000000000
--- a/Attic/appendixc/shadowpwd-patch.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-Shadow Password Suite Patch (&shadow-version;):
-<ulink url="&ftp;/">&ftp;/</ulink>
-<ulink url="&http;/">&http;/</ulink>
-
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 86ce7cf00..b8bee9341 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -27,6 +27,9 @@
 
 </para></listitem>
 
+<listitem><para>Removed shadow-utils patch in favour of a sed
+command</para></listitem>
+
 <listitem><para>Removed sysvinit patch in favour of a sed
 command.</para></listitem>
 
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index a7673a0d4..7caad0673 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -58,7 +58,6 @@
 &c3-procps;
 &c3-psmisc;
 &c3-shadowpwd;
-&c3-shadowpwd-patch;
 &c3-sysklogd;
 &c3-sysvinit;
 &c3-utillinux;
diff --git a/chapter04/shadowpwd-patch.xml b/chapter04/shadowpwd-patch.xml
deleted file mode 100644
index 577d66015..000000000
--- a/chapter04/shadowpwd-patch.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-Shadow Password Suite Patch (&shadow-version;) - &shadow-patch-size;:
-<ulink url="&ftp;/shadow-&shadow-version;.patch.bz2">&ftp;/shadow-&shadow-version;.patch.bz2</ulink>
-<ulink url="&http;/shadow-&shadow-version;.patch.bz2">&http;/shadow-&shadow-version;.patch.bz2</ulink>
-
diff --git a/chapter06/shadowpwd-exp.xml b/chapter06/shadowpwd-exp.xml
index fc162e326..924769fff 100644
--- a/chapter06/shadowpwd-exp.xml
+++ b/chapter06/shadowpwd-exp.xml
@@ -1,6 +1,10 @@
 <sect2>
 <title>Command explanations</title>
 
+<para><userinput>sed 's/\(.*\) (nflg || \(.*\)/\1\(\2/' useradd.c.temp
+&gt; src/useradd.c</userinput>: This sed is used to fix a compilation
+bug which occurs due to a variable being used but not defined.</para>
+
 <para><userinput>cp limits login.access and others:</userinput> These files
 were not installed during the installation of the package so we copy
 them manually as those files are used to configure authentication
diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml
index 040cc8acc..3a3d59644 100644
--- a/chapter06/shadowpwd-inst.xml
+++ b/chapter06/shadowpwd-inst.xml
@@ -1,12 +1,11 @@
 <sect2>
 <title>Installation of Shadow Password Suite</title>
 
-<para>Before the shadow Password Suite can be installed, the patch file
-must be unpacked.  This patch fixes a compliation problem due to a
-variable being used but not defined.  Install the Shadow Password 
-Suite by running the following commands:</para>
+<para>Install the Shadow Password Suite by running the 
+following commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../shadow-20001016.patch &amp;&amp;</userinput>
+<para><screen><userinput>mv src/useradd.c useradd.c.temp &amp;&amp;</userinput>
+<userinput>sed 's/\(.*\) (nflg || \(.*\)/\1\(\2/' useradd.c.temp &gt; src/useradd.c &amp;&amp;</userinput>
 <userinput>./configure --prefix=/usr &amp;&amp;</userinput>
 <userinput>make &amp;&amp;</userinput>
 <userinput>make install &amp;&amp;</userinput>
diff --git a/index.xml b/index.xml
index 98f0b915f..c4d481169 100644
--- a/index.xml
+++ b/index.xml
@@ -121,7 +121,6 @@
 <!ENTITY c3-procps SYSTEM "chapter3/procps.xml">
 <!ENTITY c3-psmisc SYSTEM "chapter3/psmisc.xml">
 <!ENTITY c3-shadowpwd SYSTEM "chapter3/shadowpwd.xml">
-<!ENTITY c3-shadowpwd-patch SYSTEM "chapter3/shadowpwd-patch.xml">
 <!ENTITY c3-sysklogd SYSTEM "chapter3/sysklogd.xml">
 <!ENTITY c3-sysvinit SYSTEM "chapter3/sysvinit.xml">
 <!ENTITY c3-utillinux SYSTEM "chapter3/utillinux.xml">
@@ -509,14 +508,13 @@
 <!ENTITY ac-procps SYSTEM "appendixc/procps.xml">
 <!ENTITY ac-psmisc SYSTEM "appendixc/psmisc.xml">
 <!ENTITY ac-shadowpwd SYSTEM "appendixc/shadowpwd.xml">
-<!ENTITY ac-shadowpwd-patch SYSTEM "appendixc/shadowpwd-patch.xml">
 <!ENTITY ac-sysklogd SYSTEM "appendixc/sysklogd.xml">
 <!ENTITY ac-sysvinit SYSTEM "appendixc/sysvinit.xml">
 <!ENTITY ac-utillinux SYSTEM "appendixc/utillinux.xml">
 <!ENTITY ac-netkitbase SYSTEM "appendixc/netkitbase.xml">
 <!ENTITY ac-nettools SYSTEM "appendixc/nettools.xml">
 
-<!ENTITY all-version "cvs-20010806-1924">
+<!ENTITY all-version "cvs-20010807-0600">
 <!ENTITY all-size-kb "77,160 KB">
 <!ENTITY all-size-mb "75 MB">
 
@@ -788,7 +786,6 @@
 
 <!ENTITY shadow-version "20001016">
 <!ENTITY shadow-size "551 KB">
-<!ENTITY shadow-patch-size "1 KB">
 <!ENTITY shadow-compsize "shadow MB">
 <!ENTITY shadow-time "shadow minutes">