diff --git a/appendixa/ed-down.xml b/appendixa/ed-down.xml
index 48c6e3df1..3d270b618 100644
--- a/appendixa/ed-down.xml
+++ b/appendixa/ed-down.xml
@@ -4,6 +4,6 @@
 <para><literallayout>Ed (&ed-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/ed/"/>
 
-Ed Patch:
+Ed Mkstemp Patch:
 <ulink url="&patches-root;&ed-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/expect-down.xml b/appendixa/expect-down.xml
index 1a8512349..2638fbe57 100644
--- a/appendixa/expect-down.xml
+++ b/appendixa/expect-down.xml
@@ -4,6 +4,6 @@
 <para><literallayout>Expect (&expect-version;):
 <ulink url="http://expect.nist.gov/src/"/>
 
-Expect Patch:
+Expect LFS Patch:
 <ulink url="&patches-root;&expect-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/gawk-down.xml b/appendixa/gawk-down.xml
index 609797873..5c0d5c0a5 100644
--- a/appendixa/gawk-down.xml
+++ b/appendixa/gawk-down.xml
@@ -4,6 +4,6 @@
 <para><literallayout>Gawk (&gawk-version;): 
 <ulink url="ftp://ftp.gnu.org/pub/gnu/gawk/"/>
 
-Gawk Patch:
+Gawk Libexecdir Patch:
 <ulink url="&patches-root;&gawk-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/kbd-down.xml b/appendixa/kbd-down.xml
index 1530b0ed5..54c47b7e8 100644
--- a/appendixa/kbd-down.xml
+++ b/appendixa/kbd-down.xml
@@ -4,6 +4,6 @@
 <para><literallayout>Kbd (&kbd-version;): 
 <ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/"/>
 
-Kbd Patch:
+Kbd More-Programs Patch:
 <ulink url="&patches-root;&kbd-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/procps-down.xml b/appendixa/procps-down.xml
index f13f9617a..c86ad2e8f 100644
--- a/appendixa/procps-down.xml
+++ b/appendixa/procps-down.xml
@@ -4,6 +4,6 @@
 <para><literallayout>Procps (&procps-version;):
 <ulink url="http://procps.sourceforge.net/"/>
 
-Procps Patch:
+Procps Locale Patch:
 <ulink url="&patches-root;&procps-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/zlib-down.xml b/appendixa/zlib-down.xml
index c06568dcb..0d03e9265 100644
--- a/appendixa/zlib-down.xml
+++ b/appendixa/zlib-down.xml
@@ -6,6 +6,6 @@
 <para><literallayout>Zlib (&zlib-version;):
 <ulink url="http://www.gzip.org/zlib/"/>
 
-Zlib Patch:
+Zlib Vsnprintf Patch:
 <ulink url="&patches-root;&zlib-patch;"/></literallayout></para>
 </sect2>
diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml
index 7b86380f6..6cd83278b 100644
--- a/chapter04/chapter04.xml
+++ b/chapter04/chapter04.xml
@@ -260,13 +260,13 @@ Coreutils Hostname Patch - &coreutils-hostname-patch-size;:
 Coreutils Uname Patch - &coreutils-uname-patch-size;:
 <ulink url="&patches-root;&coreutils-uname-patch;"/>
 
-Ed Patch - &ed-patch-size;:
+Ed Mkstemp Patch - &ed-patch-size;:
 <ulink url="&patches-root;&ed-patch;"/>
 
-Expect Patch - &expect-patch-size;:
+Expect LFS Patch - &expect-patch-size;:
 <ulink url="&patches-root;&expect-patch;"/>
 
-Gawk Patch - &gawk-patch-size;:
+Gawk Libexecdir Patch - &gawk-patch-size;:
 <ulink url="&patches-root;&gawk-patch;"/>
 
 GCC No-Fixincludes Patch - &gcc-nofixincludes-patch-size;:
@@ -293,7 +293,7 @@ Glibc Sscanf Patch - &glibc-sscanf-patch-size;:
 Grub Gcc33 Patch - &grub-patch-size;:
 <ulink url="&patches-root;&grub-patch;"/>
 
-Kbd Patch - &kbd-patch-size;:
+Kbd More-Programs Patch - &kbd-patch-size;:
 <ulink url="&patches-root;&kbd-patch;"/>
 
 Man 80-Columns Patch - &man-80cols-patch-size;:
@@ -317,7 +317,7 @@ Net-tools Mii-Tool-Gcc33 Patch - &net-tools-mii-patch-size;:
 Perl Libc Patch - &perl-libc-patch-size;:
 <ulink url="&patches-root;&perl-libc-patch;"/>
 
-Procps Patch - &procps-patch-size;:
+Procps Locale Patch - &procps-patch-size;:
 <ulink url="&patches-root;&procps-patch;"/>
 
 Shadow Newgrp Patch - &shadow-patch-size;:
diff --git a/chapter06/bison-inst.xml b/chapter06/bison-inst.xml
index 3fd999772..39a8f98fc 100644
--- a/chapter06/bison-inst.xml
+++ b/chapter06/bison-inst.xml
@@ -6,7 +6,7 @@
 <para>First we use a patch to bison, backported from CVS, which fixes a minor
 compilation problem with some packages:</para>
 
-<para><screen><userinput>patch -Np1 -i ../bison-1.875-attribute.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&bison-patch;</userinput></screen></para>
 
 <para>Prepare Bison for compilation:</para>
 
diff --git a/chapter06/gcc-2953-inst.xml b/chapter06/gcc-2953-inst.xml
index 3af7c987e..2204eb21a 100644
--- a/chapter06/gcc-2953-inst.xml
+++ b/chapter06/gcc-2953-inst.xml
@@ -27,9 +27,9 @@ the system GCC already installed in <filename class="directory">/usr</filename>
 
 <para>Apply the patches and make a small adjustment:</para>
 
-<para><screen><userinput>patch -Np1 -i ../&gcc-2953-patch;.patch
-patch -Np1 -i ../&gcc-2953-no-fixinc-patch;.patch
-patch -Np1 -i ../&gcc-2953-returntype-fix-patch;.patch
+<para><screen><userinput>patch -Np1 -i ../&gcc-2953-patch;
+patch -Np1 -i ../&gcc-2953-no-fixinc-patch;
+patch -Np1 -i ../&gcc-2953-returntype-fix-patch;
 echo timestamp > gcc/cstamp-h.in</userinput></screen></para>
 
 <para>The GCC documentation recommends building GCC outside of the source
diff --git a/chapter06/nettools-inst.xml b/chapter06/nettools-inst.xml
index c6783234b..d298c320b 100644
--- a/chapter06/nettools-inst.xml
+++ b/chapter06/nettools-inst.xml
@@ -16,7 +16,7 @@ but it's up to the kernel to make the protocols available.</para>
 <para>The following patch will fix a small syntax problem with the source
 for the mii-tool binary:</para>
 
-<para><screen><userinput>patch -Np1 -i ../net-tools-1.60-miitool-gcc33-1.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&net-tools-mii-patch;</userinput></screen></para>
 
 <para>Prepare Net-tools for compilation with:</para>
 
diff --git a/entities/ed.ent b/entities/ed.ent
index 4a5660727..0c8927877 100644
--- a/entities/ed.ent
+++ b/entities/ed.ent
@@ -17,7 +17,7 @@
 <!ENTITY ed-package "ed-&ed-version;.tar.bz2">
 <!ENTITY ed-size "182 KB">
 
-<!ENTITY ed-patch "ed-&ed-version;.patch">
+<!ENTITY ed-patch "ed-&ed-version;-mkstemp.patch">
 <!ENTITY ed-patch-size "1 KB">
 
 <!ENTITY ed-compsize "3 MB">
diff --git a/entities/expect.ent b/entities/expect.ent
index 296a5c8c2..e4d52ab44 100644
--- a/entities/expect.ent
+++ b/entities/expect.ent
@@ -17,7 +17,7 @@
 <!ENTITY expect-package "expect-&expect-version;.tar.bz2">
 <!ENTITY expect-size "508 KB">
 
-<!ENTITY expect-patch "expect-&expect-version;.patch">
+<!ENTITY expect-patch "expect-&expect-version;-lfs.patch">
 <!ENTITY expect-patch-size "6 KB">
 
 <!ENTITY expect-compsize-static "24 MB">
diff --git a/entities/gawk.ent b/entities/gawk.ent
index 702929f94..385bc2e9f 100644
--- a/entities/gawk.ent
+++ b/entities/gawk.ent
@@ -20,7 +20,7 @@
 <!ENTITY gawk-package "gawk-&gawk-version;.tar.bz2">
 <!ENTITY gawk-size "1,596 KB">
 
-<!ENTITY gawk-patch "gawk-&gawk-version;.patch">
+<!ENTITY gawk-patch "gawk-&gawk-version;-libexecdir.patch">
 <!ENTITY gawk-patch-size "1 KB">
 
 <!ENTITY gawk-compsize-static "17 MB">
diff --git a/entities/kbd.ent b/entities/kbd.ent
index f3a5121f1..92f444de3 100644
--- a/entities/kbd.ent
+++ b/entities/kbd.ent
@@ -17,7 +17,7 @@
 <!ENTITY kbd-package "kbd-&kbd-version;.tar.bz2">
 <!ENTITY kbd-size "801 KB">
 
-<!ENTITY kbd-patch "kbd-&kbd-version;.patch">
+<!ENTITY kbd-patch "kbd-&kbd-version;-more-programs.patch">
 <!ENTITY kbd-patch-size "1 KB">
 
 <!ENTITY kbd-compsize "8 MB">
diff --git a/entities/procps.ent b/entities/procps.ent
index 010f4e488..9dffc16be 100644
--- a/entities/procps.ent
+++ b/entities/procps.ent
@@ -17,7 +17,7 @@
 <!ENTITY procps-package "procps-&procps-version;.tar.bz2">
 <!ENTITY procps-size "242 KB">
 
-<!ENTITY procps-patch "procps-&procps-version;.patch">
+<!ENTITY procps-patch "procps-&procps-version;-locale-fix.patch">
 <!ENTITY procps-patch-size "1 KB">
 
 <!ENTITY procps-compsize "2 MB">