diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index bb1a96c28..32a41e1db 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -56,27 +56,28 @@ first a summary, then a detailed log.</para>
 
 <listitem><para>Added:</para>
 <itemizedlist>
-<listitem><para>coreutils-5.2.1-dupes-1.patch</para></listitem>
-<listitem><para>flex-2.5.31-debian-fixes-2.patch</para></listitem>
+<listitem><para>coreutils-5.2.1-suppress_hostname_uptime_kill_su-1.patch</para></listitem>
+<listitem><para>flex-2.5.31-debian_fixes-2.patch</para></listitem>
 <listitem><para>hotplug-2004_04_01</para></listitem>
-<listitem><para>hotplug-2004_04_01-bogus-deps-1.patch</para></listitem>
+<listitem><para>hotplug-2004_04_01-bogus_deps-1.patch</para></listitem>
 <listitem><para>hotplug-2004_04_01-device-2.patch</para></listitem>
 <listitem><para>hotplug-2004_04_01-isapnp-2.patch</para></listitem>
 <listitem><para>iana-etc-1.00</para></listitem>
-<listitem><para>inetutils-1.4.2-kernel-headers-1.patch</para></listitem>
-<listitem><para>inetutils-1.4.2-no-server-man-pages-1.patch</para></listitem>
+<listitem><para>inetutils-1.4.2-kernel_headers-1.patch</para></listitem>
+<listitem><para>inetutils-1.4.2-no_server_man_pages-1.patch</para></listitem>
 <listitem><para>linux-libc-headers-2.6.5.2</para></listitem>
 <listitem><para>mktemp-1.5</para></listitem>
-<listitem><para>mktemp-1.5-add-tempfile-1.patch</para></listitem>
+<listitem><para>mktemp-1.5-add_tempfile-1.patch</para></listitem>
 <listitem><para>module-init-tools-3.0</para></listitem>
 <listitem><para>net-tools-1.60-gcc34-2.patch</para></listitem>
-<listitem><para>net-tools-1.60-kernel-headers-1.patch</para></listitem>
+<listitem><para>net-tools-1.60-kernel_headers-1.patch</para></listitem>
 <listitem><para>readline-4.3</para></listitem>
-<listitem><para>readline-4.3-gnu-fixes-1.patch</para></listitem>
-<listitem><para>sysklogd-1.4.1-kernel-headers-1.patch</para></listitem>
+<listitem><para>readline-4.3-gnu_fixes-1.patch</para></listitem>
+<listitem><para>sysklogd-1.4.1-kernel_headers-1.patch</para></listitem>
+<listitem><para>sysklogd-1.4.1-signal-1.patch</para></listitem>
 <listitem><para>udev-025</para></listitem>
 <listitem><para>udev-025-config-2.patch</para></listitem>
-<listitem><para>util-linux-2.12a-kernel-headers-1.patch</para></listitem>
+<listitem><para>util-linux-2.12a-kernel_headers-1.patch</para></listitem>
 </itemizedlist>
 </listitem>
  
@@ -103,6 +104,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>June 7, 2004 [winkie]: Updated patch names to match those used
+by the patches project.</para></listitem>
+
 <listitem><para>June 7, 2004 [winkie]: Globally changed <quote>DejaGnu</quote>
 to <quote>DejaGNU</quote>.</para></listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 035f0b8c8..b2ef5dfb1 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -17,14 +17,14 @@ following:</para>
 <varlistentry>
 <term>Bash GNU Fixes Patch - 7 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;bash-&bash-version;-gnu-fixes-2.patch"/></para>
+<para><ulink url="&patches-root;bash-&bash-version;-gnu_fixes-2.patch"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term>Coreutils Dupes Patch - 16 KB:</term>
+<term>Coreutils Suppress Hostname, Uptime, Kill, Su Patch - 16 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;coreutils-&coreutils-version;-dupes-1.patch"/></para>
+<para><ulink url="&patches-root;coreutils-&coreutils-version;-suppress_hostname_uptime_kill_su-1.patch"/></para>
 </listitem>
 </varlistentry>
 
@@ -45,14 +45,14 @@ following:</para>
 <varlistentry>
 <term>Flex Brokenness Patch - 8 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;flex-&flex-version;-debian-fixes-2.patch"/></para>
+<para><ulink url="&patches-root;flex-&flex-version;-debian_fixes-2.patch"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>GCC No-Fixincludes Patch - 1 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;gcc-&gcc-short-version;-no-fixincludes-1.patch"/></para>
+<para><ulink url="&patches-root;gcc-&gcc-short-version;-no_fixincludes-1.patch"/></para>
 </listitem>
 </varlistentry>
 
@@ -66,7 +66,7 @@ following:</para>
 <varlistentry>
 <term>Hotplug Bogus Dependencies Patch- 1 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;hotplug-&hotplug-version;-bogus-deps-1.patch"/></para>
+<para><ulink url="&patches-root;hotplug-&hotplug-version;-bogus_deps-1.patch"/></para>
 </listitem>
 </varlistentry>
 
@@ -87,14 +87,14 @@ following:</para>
 <varlistentry>
 <term>Inetutils Kernel Headers Patch - 1 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;inetutils-&inetutils-version;-kernel-headers-1.patch"/></para>
+<para><ulink url="&patches-root;inetutils-&inetutils-version;-kernel_headers-1.patch"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Inetutils No-Server-Man-Pages Patch - 4 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;inetutils-&inetutils-version;-no-server-man-pages-1.patch"/></para>
+<para><ulink url="&patches-root;inetutils-&inetutils-version;-no_server_man_pages-1.patch"/></para>
 </listitem>
 </varlistentry>
 
@@ -108,7 +108,7 @@ following:</para>
 <varlistentry>
 <term>Mktemp Tempfile Patch - 3 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;mktemp-&mktemp-version;-add-tempfile-1.patch"/></para>
+<para><ulink url="&patches-root;mktemp-&mktemp-version;-add_tempfile-1.patch"/></para>
 </listitem>
 </varlistentry>
 
@@ -122,7 +122,7 @@ following:</para>
 <varlistentry>
 <term>Net-tools Kernel Headers Patch - 1 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;net-tools-&net-tools-version;-kernel-headers-1.patch"/></para>
+<para><ulink url="&patches-root;net-tools-&net-tools-version;-kernel_headers-1.patch"/></para>
 </listitem>
 </varlistentry>
 
@@ -136,14 +136,14 @@ following:</para>
 <varlistentry>
 <term>Readline GNU Fixes Patch - 5 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;readline-&readline-version;-gnu-fixes-1.patch"/></para>
+<para><ulink url="&patches-root;readline-&readline-version;-gnu_fixes-1.patch"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Sysklogd Kernel Headers Patch - 3 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;sysklogd-&sysklogd-version;-kernel-headers-1.patch"/></para>
+<para><ulink url="&patches-root;sysklogd-&sysklogd-version;-kernel_headers-1.patch"/></para>
 </listitem>
 </varlistentry>
 
@@ -163,7 +163,7 @@ following:</para>
 <varlistentry>
 <term>Util-Linux Kernel Headers Patch - 3 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;util-linux-&util-linux-version;-kernel-headers-1.patch"/></para>
+<para><ulink url="&patches-root;util-linux-&util-linux-version;-kernel_headers-1.patch"/></para>
 </listitem>
 </varlistentry>
 
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index cae6ba5a2..a76c56019 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -30,7 +30,7 @@
 <para>Bash contains several known bugs. Fix these with the following
 patch:</para>
 
-<screen><userinput>patch -Np1 -i ../bash-&bash-version;-gnu-fixes-2.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../bash-&bash-version;-gnu_fixes-2.patch</userinput></screen>
 
 <para>Now prepare Bash for compilation:</para>
 
diff --git a/chapter05/flex.xml b/chapter05/flex.xml
index 94c91a1dd..064ae4b31 100644
--- a/chapter05/flex.xml
+++ b/chapter05/flex.xml
@@ -29,7 +29,7 @@
 
 <para>Flex contains several known bugs. Fix these with the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../flex-&flex-version;-debian-fixes-2.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../flex-&flex-version;-debian_fixes-2.patch</userinput></screen>
 
 <para>The GNU autotools detects that the Flex source code has been modified by
 the patch, and tries to update the man pages to include those changes, but this
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 3d451ce11..8a62c1dcc 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -52,7 +52,7 @@ into a single <filename class="directory">gcc-&gcc-version;/</filename> subdirec
 
 <para>First correct a problem and make an essential adjustment:</para>
 
-<screen><userinput>patch -Np1 -i ../gcc-&gcc-short-version;-no-fixincludes-1.patch
+<screen><userinput>patch -Np1 -i ../gcc-&gcc-short-version;-no_fixincludes-1.patch
 patch -Np1 -i ../gcc-&gcc-short-version;-specs-1.patch</userinput></screen>
 
 <para>The first patch disables the GCC <command>fixincludes</command> script. We
diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml
index 2828dc629..1f7ab22b1 100644
--- a/chapter05/util-linux.xml
+++ b/chapter05/util-linux.xml
@@ -30,7 +30,7 @@
 <para>Util-linux has issues with the Linux 2.6 kernel series - fix these issues
 by applying the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-kernel-headers-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-kernel_headers-1.patch</userinput></screen>
 
 <para>Util-linux doesn't use the freshly installed headers and libraries
 from the <filename class="directory">/tools</filename> directory.  This is fixed by altering the configure
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index f2fcf435a..002a043ff 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -32,7 +32,7 @@ GCC, Glibc, Grep, Make, Ncurses, Sed.</seg></seglistitem>
 way it is expected at times. Fix this behavior with the following
 patch:</para>
 
-<screen><userinput>patch -Np1 -i ../bash-&bash-version;-gnu-fixes-2.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../bash-&bash-version;-gnu_fixes-2.patch</userinput></screen>
 
 <para>Now prepare Bash for compilation:</para>
 
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 983db0db8..af5251262 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -39,7 +39,7 @@ architectures:</para>
 <para>Prevent Coreutils from installing binaries that will be later be installed
 by other programs:</para>
 
-<screen><userinput>patch -Np1 -i ../coreutils-&coreutils-version;-dupes-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../coreutils-&coreutils-version;-suppress_hostname_uptime_kill_su-1.patch</userinput></screen>
 
 <para>Now prepare Coreutils for compilation:</para>
 
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index ce0f86e5a..5fcfbb3f8 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -31,7 +31,7 @@ GCC, Gettext, Glibc, Grep, M4, Make, Sed</seg></seglistitem>
 
 <para>Flex contains several known bugs. Fix these with the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../flex-&flex-version;-debian-fixes-2.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../flex-&flex-version;-debian_fixes-2.patch</userinput></screen>
 
 <para>The GNU autotools detects that the Flex source code has been modified by the patch,
 and tries to update the man pages to include those changes, but this breaks on many
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 669bf3eaa..662e95dfe 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -44,7 +44,7 @@ compilers. Instructions for building these can be found at
 <para>First apply only the No-Fixincludes patch (and <emphasis>not</emphasis>
 the Specs patch) also used in the previous chapter:</para>
 
-<screen><userinput>patch -Np1 -i ../gcc-&gcc-short-version;-no-fixincludes-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../gcc-&gcc-short-version;-no_fixincludes-1.patch</userinput></screen>
 
 <para>Now apply a sed substitution that will suppress the installation of
 <filename>libiberty.a</filename>. We want to use the version of
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index cd9914cff..2b282aa93 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -31,13 +31,13 @@ Diffutils, GCC, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
 <para>Inetutils has issues with the Linux 2.6 kernel series - fix these isues
 by applying the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../inetutils-&inetutils-version;-kernel-headers-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../inetutils-&inetutils-version;-kernel_headers-1.patch</userinput></screen>
 
 <para>We are not going to install all the programs that come with Inetutils.
 However, the Inetutils build system will insist on installing all the man
 pages anyway. The following patch will correct this situation:</para>
 
-<screen><userinput>patch -Np1 -i ../inetutils-&inetutils-version;-no-server-man-pages-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../inetutils-&inetutils-version;-no_server_man_pages-1.patch</userinput></screen>
 
 <para>Now prepare Inetutils for compilation:</para>
 
diff --git a/chapter06/mktemp.xml b/chapter06/mktemp.xml
index 07944e904..2b3a2582b 100644
--- a/chapter06/mktemp.xml
+++ b/chapter06/mktemp.xml
@@ -30,7 +30,7 @@ files in shell scripts.</para>
 program, which has functionality much the same as <command>mktemp</command>.
 Patch mktemp to include a <command>tempfile</command> wrapper:</para>
 
-<screen><userinput>patch -Np1 -i ../mktemp-&mktemp-version;-add-tempfile-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../mktemp-&mktemp-version;-add_tempfile-1.patch</userinput></screen>
 
 <para>Now prepare Mktemp for compilation:</para>
 
diff --git a/chapter06/net-tools.xml b/chapter06/net-tools.xml
index 1c3b45b72..de02cbc44 100644
--- a/chapter06/net-tools.xml
+++ b/chapter06/net-tools.xml
@@ -46,7 +46,7 @@ fix by applying the following patch:</para>
 <para>Net-tools has issues with the Linux 2.6 kernel series - fix these issues
 by applying the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-kernel-headers-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-kernel_headers-1.patch</userinput></screen>
 
 <para>Now prepare Net-tools for compilation (if you intend to accept the
 defaults, you can skip all the questions by running <userinput>yes "" |
diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index 5884b1d05..2694912dc 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -32,7 +32,7 @@ GCC, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
 way it is expected at times. Fix this behavior with the following
 patch:</para>
 
-<screen><userinput>patch -Np1 -i ../readline-&readline-version;-gnu-fixes-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../readline-&readline-version;-gnu_fixes-1.patch</userinput></screen>
 
 <para>Now prepare Readline for compilation:</para>
 
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index deb95e22a..097cd077a 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -31,7 +31,7 @@ as those given by the kernel when unusual things happen.</para>
 <para>Sysklogd has issues with the Linux 2.6 kernel series - fix these isues
 by applying the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../sysklogd-&sysklogd-version;-kernel-headers-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../sysklogd-&sysklogd-version;-kernel_headers-1.patch</userinput></screen>
 
 <para>There is also a race condition in the signal handling logic, and this
 sometimes confuses the <command>sysklogd</command> initscript.
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index ac1413644..64658f402 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -48,7 +48,7 @@ mkdir -p /var/lib/hwclock</userinput></screen>
 <para>Util-linux has issues with the Linux 2.6 kernel series - fix these isues
 by applying the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-kernel-headers-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-kernel_headers-1.patch</userinput></screen>
 
 <para>Prepare Util-linux for compilation:</para>