Changed patches to use entities

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@5402 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

81 files changed, 215 insertions, 66 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d5fc50384..9a93a5cae 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-scatter-changelog">
 <title>Changelog</title>
@@ -59,16 +61,16 @@ First a summary, then a detailed log.</para>
 
 <listitem><para>Added:</para>
 <itemizedlist>
-<listitem><para>bash-3.0-fixes-3.patch</para></listitem>
-<listitem><para>bash-3.0-avoid_WCONTINUED-1.patch</para></listitem>
-<listitem><para>glibc-2.3.5-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>
-<listitem><para>vim-6.0-security_fix-1.patch</para></listitem>
+<listitem><para>&bash-fixes-patch;</para></listitem>
+<listitem><para>&bash-avoid_WCONTINUED-patch;</para></listitem>
+<listitem><para>&glibc-testfix-patch;</para></listitem>
+<listitem><para>&gzip-security_fix-patch;</para></listitem>
+<listitem><para>Hotplug &hotplug-version;</para></listitem>
+<listitem><para>&gzip-security_fix-patch;</para></listitem>
+<listitem><para>&sysklogd-fixes-patch;</para></listitem>
+<listitem><para>&tar-sparse_fix-patch;</para></listitem>
+<listitem><para>&util-linux-cramfs-patch;</para></listitem>
+<listitem><para>&vim-security_fix-patch;</para></listitem>
 </itemizedlist>
 </listitem>
  
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 63cc99966..451f1b932 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="materials-patches">
 <title>Needed Patches</title>
@@ -18,144 +20,137 @@ needed to build an LFS system:</para>
 <varlistentry>
 <term>Bash Various Fixes - 23 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;bash-&bash-version;-fixes-3.patch"/></para>
+<para><ulink url="&patches-root;&bash-fixes-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Bash Avoid Wcontinued Patch - 1 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;bash-&bash-version;-avoid_WCONTINUED-1.patch"/></para>
+<para><ulink url="&patches-root;&bash-avoid_WCONTINUED-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Coreutils Suppress Uptime, Kill, Su Patch - 16 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch"/></para>
+<para><ulink url="&patches-root;&coreutils-suppress-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Coreutils Uname Patch - 1 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;coreutils-&coreutils-version;-uname-2.patch"/></para>
+<para><ulink url="&patches-root;&coreutils-uname-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Expect Spawn Patch - 6 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;expect-&expect-version;-spawn-1.patch"/></para>
+<para><ulink url="&patches-root;&expect-spawn-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <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-fixes-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term> GCC Linkonce Patch - 12 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;gcc-&gcc-version;-linkonce-1.patch"/></para>
+<para><ulink url="&patches-root;&gcc-linkonce-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>GCC No-Fixincludes Patch - 1 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;gcc-&gcc-version;-no_fixincludes-1.patch"/></para>
+<para><ulink url="&patches-root;&gcc-no_fixincludes-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>GCC Specs Patch - 11 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;gcc-&gcc-version;-specs-2.patch"/></para>
+<para><ulink url="&patches-root;&gcc-specs-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Glibc Fix Testsuite Patch - 1 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;glibc-&glibc-version;-fix_test-1.patch"/></para>
+<para><ulink url="&patches-root;&glibc-testfix-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Gzip Security Patch - 2KB:</term><listitem>
-<para><ulink url="&patches-root;gzip-&gzip-version;-security_fixes-1.patch"/></para>
-</listitem>
-</varlistentry>
-
-<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;&gzip-security_fix-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-man_pages-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <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-tempfile-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Perl Libc Patch - 1 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;perl-&perl-version;-libc-1.patch"/></para>
+<para><ulink url="&patches-root;&perl-libc-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Readline Fixes Patch - 1 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;readline-&readline-version;-fixes-1.patch"/></para>
+<para><ulink url="&patches-root;&readline-fixes-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Shadow Lastlog Fix Patch - 1 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;shadow-&shadow-version;-fix_lastlog-1.patch"/></para>
+<para><ulink url="&patches-root;&shadow-lastlog-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Sysklogd Fixes Patch - 27 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;sysklogd-&sysklogd-version;-fixes-1.patch"/></para>
+<para><ulink url="&patches-root;&sysklogd-fixes-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Tar Sparse Fix Patch - 1 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;tar-&tar-version;-sparse_fix-1.patch"/></para>
+<para><ulink url="&patches-root;&tar-sparse_fix-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Util-linux Cramfs Patch - 2kb:</term> <listitem>
-<para><ulink url="&patches-root;util-linux-&util-linux-version;-cramfs-1.patch"/></para>
+<para><ulink url="&patches-root;&util-linux-cramfs-patch;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Vim Security Patch - 8KB:</term><listitem>
-<para><ulink url="&patches-root;vim-&vim-version;-security_fix-1.patch"/></para>
+<para><ulink url="&patches-root;&vim-security_fix-patch;"/></para>
 </listitem>
 </varlistentry>
 
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 930bd964a..3cd497081 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-bash" role="wrap">
 <title>Bash-&bash-version;</title>
@@ -31,7 +33,7 @@
 <para>Bash has a problem when compiled against newer versions of Glibc, causing
 it to hang inappropriately.  This patch fixes the problem:</para>
 
-<screen><userinput>patch -Np1 -i ../bash-&bash-version;-avoid_WCONTINUED-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&bash-avoid_WCONTINUED-patch;</userinput></screen>
 
 <para>Prepare Bash for compilation:</para>
 
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index e2eafc63e..44ae7bb20 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-binutils-pass1" role="wrap">
 <title>Binutils-&binutils-version; - Pass 1</title>
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 85a574309..fd1e866ff 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-binutils-pass2" role="wrap">
 <title>Binutils-&binutils-version; - Pass 2</title>
diff --git a/chapter05/bison.xml b/chapter05/bison.xml
index dc237997d..f3bcb69f5 100644
--- a/chapter05/bison.xml
+++ b/chapter05/bison.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-bison" xreflabel="Bison" role="wrap">
 <title>Bison-&bison-version;</title>
diff --git a/chapter05/bzip2.xml b/chapter05/bzip2.xml
index e30a7c536..65c948891 100644
--- a/chapter05/bzip2.xml
+++ b/chapter05/bzip2.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-bzip2" role="wrap">
 <title>Bzip2-&bzip2-version;</title>
diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml
index e7bf67d37..88fd40600 100644
--- a/chapter05/coreutils.xml
+++ b/chapter05/coreutils.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-coreutils" role="wrap">
 <title>Coreutils-&coreutils-version;</title>
diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml
index eb18225f4..36c272f5c 100644
--- a/chapter05/dejagnu.xml
+++ b/chapter05/dejagnu.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-dejagnu" role="wrap">
 <title>DejaGNU-&dejagnu-version;</title>
diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml
index b3408d512..bddd6a34a 100644
--- a/chapter05/diffutils.xml
+++ b/chapter05/diffutils.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-diffutils" role="wrap">
 <title>Diffutils-&diffutils-version;</title>
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 0bb187582..aa4f0519d 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-expect" role="wrap">
 <title>Expect-&expect-version;</title>
@@ -32,7 +34,7 @@ GCC, Glibc, Grep, Make, Sed, and Tcl</seg></seglistitem>
 <para>First, fix a bug that can result in false failures during the GCC test
 suite run:</para>
 
-<screen><userinput>patch -Np1 -i ../expect-&expect-version;-spawn-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&expect-spawn-patch;</userinput></screen>
 
 <para>Now prepare Expect for compilation:</para>
 
diff --git a/chapter05/findutils.xml b/chapter05/findutils.xml
index d75f15b90..3ac2aaf03 100644
--- a/chapter05/findutils.xml
+++ b/chapter05/findutils.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-findutils" role="wrap">
 <title>Findutils-&findutils-version;</title>
diff --git a/chapter05/flex.xml b/chapter05/flex.xml
index c78a52ffc..1d95dd788 100644
--- a/chapter05/flex.xml
+++ b/chapter05/flex.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-flex" role="wrap">
 <title>Flex-&flex-version;</title>
@@ -30,7 +32,7 @@
 <para>Flex contains several known bugs. These can be fixed 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-fixes-patch;</userinput></screen>
 
 <para>The GNU autotools will detect that the Flex source code has been
 modified by the previous patch and tries to update the manual page
diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml
index e72817f81..4592c2cf7 100644
--- a/chapter05/gawk.xml
+++ b/chapter05/gawk.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-gawk" role="wrap">
 <title>Gawk-&gawk-version;</title>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index f2bec515b..714084dae 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-gcc-pass1" role="wrap">
 <title>GCC-&gcc-version; - Pass 1</title>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 202f9a0d9..c73eb3183 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-gcc-pass2" role="wrap">
 <title>GCC-&gcc-version; - Pass 2</title>
@@ -64,8 +66,8 @@ class="directory">gcc-&gcc-version;/</filename> subdirectory.</para>
 
 <para>First correct a known problem and make an essential adjustment:</para>
 
-<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch
-patch -Np1 -i ../gcc-&gcc-version;-specs-2.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&gcc-no_fixincludes-patch;
+patch -Np1 -i ../&gcc-specs-patch;</userinput></screen>
 
 <para>The first patch disables the GCC <command>fixincludes</command>
 script. This was briefly mentioned earlier, but a more in-depth
diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml
index 26b6b42d2..a929474bb 100644
--- a/chapter05/gettext.xml
+++ b/chapter05/gettext.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-gettext" role="wrap">
 <title>Gettext-&gettext-version;</title>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 8b166917b..bc91e1f73 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-glibc" role="wrap">
 <title>Glibc-&glibc-version;</title>
@@ -42,7 +44,7 @@ risk.</para>
 problem has been determined to be with the tests themselves, not with the libc
 nor the kernel. If you plan to run the testsuite apply this patch:</para>
 
-<screen><userinput>patch -Np1 -i ../glibc-&glibc-version;-fix_test-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&glibc-testfix-patch;</userinput></screen>
 
 <para>The Glibc documentation recommends building Glibc outside of the source
 directory in a dedicated build directory:</para>
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index 6cc9ce553..a88318b17 100644
--- a/chapter05/grep.xml
+++ b/chapter05/grep.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-grep" role="wrap">
 <title>Grep-&grep-version;</title>
diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml
index 3683d5ff9..462e8e3d9 100644
--- a/chapter05/gzip.xml
+++ b/chapter05/gzip.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-gzip" role="wrap">
 <title>Gzip-&gzip-version;</title>
diff --git a/chapter05/linux-libc-headers.xml b/chapter05/linux-libc-headers.xml
index 4370bef9f..edfb6f253 100644
--- a/chapter05/linux-libc-headers.xml
+++ b/chapter05/linux-libc-headers.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-linux-libc-headers" role="wrap">
 <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
diff --git a/chapter05/m4.xml b/chapter05/m4.xml
index c861f0593..2d96d0611 100644
--- a/chapter05/m4.xml
+++ b/chapter05/m4.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-m4" role="wrap">
 <title>M4-&m4-version;</title>
diff --git a/chapter05/make.xml b/chapter05/make.xml
index d20b8ac0a..35278334d 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-make" role="wrap">
 <title>Make-&make-version;</title>
diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index 72538b445..068b417d7 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-ncurses" role="wrap">
 <title>Ncurses-&ncurses-version;</title>
diff --git a/chapter05/patch.xml b/chapter05/patch.xml
index ec5bc8888..d4644fad0 100644
--- a/chapter05/patch.xml
+++ b/chapter05/patch.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-patch" role="wrap">
 <title>Patch-&patch-version;</title>
diff --git a/chapter05/perl.xml b/chapter05/perl.xml
index 77d619441..9ead25c0f 100644
--- a/chapter05/perl.xml
+++ b/chapter05/perl.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-perl" role="wrap">
 <title>Perl-&perl-version;</title>
@@ -30,7 +32,7 @@
 <para>First adapt some hard-wired paths to the C library by applying
 the following patch:</para>
 
-<screen><userinput>patch -Np1 -i ../perl-&perl-version;-libc-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
 
 <para>Prepare Perl for compilation (make sure to get the 'IO Fcntl POSIX'
 part of the command correct&mdash;they are all letters):</para>
diff --git a/chapter05/sed.xml b/chapter05/sed.xml
index 9bb1090e4..9c75d7359 100644
--- a/chapter05/sed.xml
+++ b/chapter05/sed.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-sed" role="wrap">
 <title>Sed-&sed-version;</title>
diff --git a/chapter05/tar.xml b/chapter05/tar.xml
index 21e59b24c..bd293c8cb 100644
--- a/chapter05/tar.xml
+++ b/chapter05/tar.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-tar" role="wrap">
 <title>Tar-&tar-version;</title>
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index da4c70be5..80d27112f 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-tcl" role="wrap">
 <title>Tcl-&tcl-version;</title>
diff --git a/chapter05/texinfo.xml b/chapter05/texinfo.xml
index 3a7ddf4c6..37ef86859 100644
--- a/chapter05/texinfo.xml
+++ b/chapter05/texinfo.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-texinfo" role="wrap">
 <title>Texinfo-&texinfo-version;</title>
diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml
index 1c0ae3c19..a0d011163 100644
--- a/chapter05/util-linux.xml
+++ b/chapter05/util-linux.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-tools-util-linux" role="wrap">
 <title>Util-linux-&util-linux-version;</title>
diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml
index 793c5e566..63fd4eba7 100644
--- a/chapter06/autoconf.xml
+++ b/chapter06/autoconf.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-autoconf" role="wrap">
 <title>Autoconf-&autoconf-version;</title>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 91a70338f..2202f65ca 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-automake" role="wrap">
 <title>Automake-&automake-version;</title>
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 43ea07291..184e88871 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-bash" role="wrap">
 <title>Bash-&bash-version;</title>
@@ -32,12 +34,12 @@ GCC, Glibc, Grep, Make, Ncurses, and Sed.</seg></seglistitem>
 <para>The following patch fixes various issues, including a problem where Bash
 will sometimes only show 33 characters on a line, then wrap to the next:</para>
 
-<screen><userinput>patch -Np1 -i ../bash-&bash-version;-fixes-3.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
 
 <para>Bash also has issues when compiled against newer versions of Glibc.  The
 following patch resolves this problem:</para>
 
-<screen><userinput>patch -Np1 -i ../bash-&bash-version;-avoid_WCONTINUED-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&bash-avoid_WCONTINUED-patch;</userinput></screen>
 
 <para>Prepare Bash for compilation:</para>
 
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index ba8ce561c..d4eaca3c5 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-binutils" role="wrap">
 <title>Binutils-&binutils-version;</title>
diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index 03443e36a..0c3474d6e 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-bison" role="wrap">
 <title>Bison-&bison-version;</title>
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index b6aa93d29..9b386cc36 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-bzip2" role="wrap">
 <title>Bzip2-&bzip2-version;</title>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 961463d73..63185598c 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-coreutils" role="wrap">
 <title>Coreutils-&coreutils-version;</title>
@@ -34,13 +36,12 @@ this package is that the <parameter>-p</parameter> switch always
 returns <computeroutput>unknown</computeroutput>. The following patch
 fixes this behavior for Intel architectures:</para>
 
-<screen><userinput>patch -Np1 -i ../coreutils-&coreutils-version;-uname-2.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&coreutils-uname-patch;</userinput></screen>
 
 <para>Prevent Coreutils from installing binaries that will be later be
 installed by other packages:</para>
 
-<screen><userinput>patch -Np1 -i \
-    ../coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&coreutils-suppress-patch;</userinput></screen>
 
 <para>Now prepare Coreutils for compilation:</para>
 
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml
index 0ed1725f4..30d649089 100644
--- a/chapter06/diffutils.xml
+++ b/chapter06/diffutils.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-diffutils" role="wrap">
 <title>Diffutils-&diffutils-version;</title>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 091794edc..00ab4387d 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-e2fsprogs" role="wrap">
 <title>E2fsprogs-&e2fsprogs-version;</title>
diff --git a/chapter06/file.xml b/chapter06/file.xml
index 71a6fe651..e34fec4d7 100644
--- a/chapter06/file.xml
+++ b/chapter06/file.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-file" role="wrap">
 <title>File-&file-version;</title>
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index c025b2700..0cd97d284 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-findutils" role="wrap">
 <title>Findutils-&findutils-version;</title>
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index d75695c16..87a2a424a 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-flex" role="wrap">
 <title>Flex-&flex-version;</title>
@@ -31,7 +33,7 @@ GCC, Gettext, Glibc, Grep, M4, Make, and 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-fixes-patch;</userinput></screen>
 
 <para>The GNU autotools detects that the Flex source code has been
 modified by the previous patch and tries to update the manual page
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index d24f9723f..308a04216 100644
--- a/chapter06/gawk.xml
+++ b/chapter06/gawk.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-gawk" role="wrap">
 <title>Gawk-&gawk-version;</title>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index c0426ef38..5afbc04ec 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-gcc" role="wrap">
 <title>GCC-&gcc-version;</title>
@@ -42,13 +44,13 @@ into the same directory. Likewise, extract the gcc-testsuite tarball.</para>
 <para>Apply only the No-Fixincludes patch (not the Specs patch) also
 used in the previous chapter:</para>
 
-<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&gcc-no_fixincludes-patch;</userinput></screen>
 
 <para>GCC fails to compile some packages outside of a base Linux From Scratch
 install (e.g., Mozilla and kdegraphics) when used in conjunction with newer
 versions of Binutils.  Apply the following patch to fix this issue:</para>
 
-<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-linkonce-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&gcc-linkonce-patch;</userinput></screen>
 
 <para>Apply a sed substitution that will suppress the installation of
 <filename class="libraryfile">libiberty.a</filename>. The version of
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index e8db6bb7a..ad7399313 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-gettext" role="wrap">
 <title>Gettext-&gettext-version;</title>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 26bbcbeb8..c2de56938 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-glibc" role="wrap">
 <title>Glibc-&glibc-version;</title>
@@ -55,7 +57,7 @@ within the Glibc source directory:</para>
 problem has been determined to be with the tests themselves, not with the libc
 nor the kernel. This patch fixes the problem:</para>
 
-<screen><userinput>patch -Np1 -i ../glibc-&glibc-version;-fix_test-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&glibc-testfix-patch;</userinput></screen>
 
 <para>The Glibc documentation recommends building Glibc outside of the source
 directory in a dedicated build directory:</para>
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index fc663377c..21b703660 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-grep" role="wrap">
 <title>Grep-&grep-version;</title>
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index b386a073e..14089e5ca 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-groff" role="wrap">
 <title>Groff-&groff-version;</title>
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index f1d00331e..823e0564d 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-grub" role="wrap">
 <title>Grub-&grub-version;</title>
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index a86d597f0..32cd3ecf4 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-gzip" role="wrap">
 <title>Gzip-&gzip-version;</title>
@@ -32,7 +34,7 @@ GCC, Glibc, Grep, Make, and Sed</seg></seglistitem>
 <para>Gzip has 2 known security vulnerabilites.  The following patch
 addresses both of them:</para>
 
-<screen><userinput>patch -Np1 -i ../gzip-&gzip-version;-security_fixes-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&gzip-security_fix-patch;</userinput></screen>
 
 <para>Prepare Gzip for compilation:</para>
 
diff --git a/chapter06/hotplug.xml b/chapter06/hotplug.xml
index de01c7f41..de54911c9 100644
--- a/chapter06/hotplug.xml
+++ b/chapter06/hotplug.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-hotplug" xreflabel="Hotplug" role="wrap">
 <title>Hotplug-&hotplug-version;</title>
diff --git a/chapter06/iana-etc.xml b/chapter06/iana-etc.xml
index 9b2ed104e..856ff2f21 100644
--- a/chapter06/iana-etc.xml
+++ b/chapter06/iana-etc.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-iana-etc" role="wrap">
 <title>Iana-Etc-&iana-etc-version;</title>
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 06d8d9b79..47dc44203 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-inetutils" role="wrap">
 <title>Inetutils-&inetutils-version;</title>
@@ -28,17 +30,12 @@ Diffutils, GCC, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Inetutils</title>
 
-<para>Inetutils has issues with the Linux 2.6 kernel series. Fix these
-issues by applying the following patch:</para>
-
-<screen><userinput>patch -Np1 -i ../inetutils-&inetutils-version;-kernel_headers-1.patch</userinput></screen>
-
 <para>All programs that come with Inetutils will not be installed.
 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-man_pages-patch;</userinput></screen>
 
 <para>Prepare Inetutils for compilation:</para>
 
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index 9b2c9fae3..8f72fa66b 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-iproute2" role="wrap">
   <title>IPRoute2-&iproute2-version;</title>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index dfaff7d28..9b2d7ab6b 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-kbd" role="wrap">
 <title>Kbd-&kbd-version;</title>
diff --git a/chapter06/less.xml b/chapter06/less.xml
index 33828d2a5..0854fde7d 100644
--- a/chapter06/less.xml
+++ b/chapter06/less.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-less" role="wrap">
 <title>Less-&less-version;</title>
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index fad57d99a..8bce33a6c 100644
--- a/chapter06/libtool.xml
+++ b/chapter06/libtool.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-libtool" role="wrap">
 <title>Libtool-&libtool-version;</title>
diff --git a/chapter06/linux-libc-headers.xml b/chapter06/linux-libc-headers.xml
index 64f18971a..067a9b7df 100644
--- a/chapter06/linux-libc-headers.xml
+++ b/chapter06/linux-libc-headers.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-linux-libc-headers" role="wrap">
 <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index 6ea4b2bbb..de43f03a6 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-m4" role="wrap">
 <title>M4-&m4-version;</title>
diff --git a/chapter06/make.xml b/chapter06/make.xml
index 39d5b7270..9e86045a1 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-make" role="wrap">
 <title>Make-&make-version;</title>
diff --git a/chapter06/man-pages.xml b/chapter06/man-pages.xml
index 574b6f872..2f32f9446 100644
--- a/chapter06/man-pages.xml
+++ b/chapter06/man-pages.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-man-pages" role="wrap">
 <title>Man-pages-&man-pages-version;</title>
diff --git a/chapter06/man.xml b/chapter06/man.xml
index b6c9a312d..22ea80c03 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-man" role="wrap">
 <title>Man-&man-version;</title>
diff --git a/chapter06/mktemp.xml b/chapter06/mktemp.xml
index 7e2f64150..24bf009ea 100644
--- a/chapter06/mktemp.xml
+++ b/chapter06/mktemp.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-mktemp" role="wrap">
 <title>Mktemp-&mktemp-version;</title>
@@ -33,7 +35,7 @@ files in shell scripts.</para>
 to <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-tempfile-patch;</userinput></screen>
 
 <para>Prepare Mktemp for compilation:</para>
 
diff --git a/chapter06/module-init-tools.xml b/chapter06/module-init-tools.xml
index 53cf74e3c..a3f8412c4 100644
--- a/chapter06/module-init-tools.xml
+++ b/chapter06/module-init-tools.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-module-init-tools" role="wrap">
 <title>Module-Init-Tools-&module-init-tools-version;</title>
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index cfa053141..c73902ab6 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-ncurses" role="wrap">
 <title>Ncurses-&ncurses-version;</title>
diff --git a/chapter06/patch.xml b/chapter06/patch.xml
index 53234194a..53197f88f 100644
--- a/chapter06/patch.xml
+++ b/chapter06/patch.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-patch" role="wrap">
 <title>Patch-&patch-version;</title>
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index b57eb9b8f..7885f8b70 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-perl" role="wrap">
 <title>Perl-&perl-version;</title>
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 945bc6978..94dfabe08 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-procps" role="wrap">
 <title>Procps-&procps-version;</title>
diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml
index 7d382e227..f0ed5a263 100644
--- a/chapter06/psmisc.xml
+++ b/chapter06/psmisc.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-psmisc" role="wrap">
 <title>Psmisc-&psmisc-version;</title>
diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index 99598bc03..7208b4658 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-readline" role="wrap">
 <title>Readline-&readline-version;</title>
@@ -33,7 +35,7 @@ Readline sometimes only shows 33 characters on a line and then wraps
 to the next line. It also includes other fixes recommended by the
 Readline author.</para>
 
-<screen><userinput>patch -Np1 -i ../readline-&readline-version;-fixes-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
 
 <para>Prepare Readline for compilation:</para>
 
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index 74b5d8f15..11b3cdeb8 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-sed" role="wrap">
 <title>Sed-&sed-version;</title>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index be7f79ff1..d40293395 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-shadow" role="wrap">
 <title>Shadow-&shadow-version;</title>
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index 2a4a71964..8b44445ae 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-sysklogd" xreflabel="Sysklogd" role="wrap">
 <title>Sysklogd-&sysklogd-version;</title>
@@ -31,7 +33,7 @@ as those given by the kernel when unusual things happen.</para>
 <para>The following patch fixes various issues, including a problem building
 Sysklogd with Linux 2.6 series kernels</para>
 
-<screen><userinput>patch -Np1 -i ../sysklogd-&sysklogd-version;-fixes-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&sysklogd-fixes-patch;</userinput></screen>
 
 <para>Compile the package:</para>
 
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index b0ca29efa..f0f489af2 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-sysvinit" role="wrap">
 <title>Sysvinit-&sysvinit-version;</title>
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index afa88e251..47e0acc8b 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-tar" role="wrap">
 <title>Tar-&tar-version;</title>
@@ -31,7 +33,7 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, and Sed</seg></seglistitem>
 <para>Tar has a bug when the <parameter>-S</parameter> option is used 
 with files larger than 4 GB. The following patch properly fixes this issue:</para>
 
-<screen><userinput>patch -Np1 -i ../tar-&tar-version;-sparse_fix-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&tar-sparse_fix-patch;</userinput></screen>
 
 <para>Prepare Tar for compilation:</para>
 
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 01ed026b0..82b0b598d 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-texinfo" role="wrap">
 <title>Texinfo-&texinfo-version;</title>
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index bc89e9453..84f81a553 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-udev" role="wrap">
 <title>Udev-&udev-version;</title>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 6233ada8e..463207ced 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-util-linux" role="wrap">
 <title>Util-linux-&util-linux-version;</title>
@@ -49,7 +51,7 @@ mkdir -p /var/lib/hwclock</userinput></screen>
 <para>Util-linux has a compilation error against newer versions of
 Linux-Libc-Headers.  The following patch properly fixes that issue</para>
 
-<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-cramfs-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;</userinput></screen>
 
 <para>Prepare Util-linux for compilation:</para>
 
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index ed8d5599a..0a5b03695 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-vim" role="wrap">
 <title>Vim-&vim-version;</title>
@@ -49,7 +51,7 @@ echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' &gt;&gt; src/feature.h</userinput><
 <para>Vim has a security vulnerability already addressed upstream.  The
 following patch fixes the problem:</para>
 
-<screen><userinput>patch -Np1 -i ../vim-&vim-version;-security_fix-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&vim-security_fix-patch;</userinput></screen>
 
 <para>Now prepare Vim for compilation:</para>
 
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index c8497e1ae..cf1adee16 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
+  <!ENTITY % patches-entities SYSTEM "../patches.ent">
   %general-entities;
+  %patches-entities;
 ]>
 <sect1 id="ch-system-zlib" role="wrap">
 <title>Zlib-&zlib-version;</title>