Index: chapter06/autoconf.xml
===================================================================
--- chapter06/autoconf.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/autoconf.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/automake.xml
===================================================================
--- chapter06/automake.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/automake.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/bash.xml
===================================================================
--- chapter06/bash.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/bash.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
@@ -33,10 +35,10 @@
 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>
Index: chapter06/binutils.xml
===================================================================
--- chapter06/binutils.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/binutils.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/bison.xml
===================================================================
--- chapter06/bison.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/bison.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/bzip2.xml
===================================================================
--- chapter06/bzip2.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/bzip2.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/coreutils.xml
===================================================================
--- chapter06/coreutils.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/coreutils.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
@@ -35,11 +37,10 @@
 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>
Index: chapter06/diffutils.xml
===================================================================
--- chapter06/diffutils.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/diffutils.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/e2fsprogs.xml
===================================================================
--- chapter06/e2fsprogs.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/e2fsprogs.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/file.xml
===================================================================
--- chapter06/file.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/file.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/findutils.xml
===================================================================
--- chapter06/findutils.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/findutils.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/flex.xml
===================================================================
--- chapter06/flex.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/flex.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
@@ -32,5 +34,5 @@
 <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
Index: chapter06/gawk.xml
===================================================================
--- chapter06/gawk.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/gawk.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/gcc.xml
===================================================================
--- chapter06/gcc.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/gcc.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
@@ -43,5 +45,5 @@
 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
@@ -49,5 +51,5 @@
 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
Index: chapter06/gettext.xml
===================================================================
--- chapter06/gettext.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/gettext.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/glibc.xml
===================================================================
--- chapter06/glibc.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/glibc.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
@@ -56,5 +58,5 @@
 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
Index: chapter06/grep.xml
===================================================================
--- chapter06/grep.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/grep.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/groff.xml
===================================================================
--- chapter06/groff.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/groff.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/grub.xml
===================================================================
--- chapter06/grub.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/grub.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/gzip.xml
===================================================================
--- chapter06/gzip.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/gzip.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
@@ -33,5 +35,5 @@
 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>
Index: chapter06/hotplug.xml
===================================================================
--- chapter06/hotplug.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/hotplug.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/iana-etc.xml
===================================================================
--- chapter06/iana-etc.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/iana-etc.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/inetutils.xml
===================================================================
--- chapter06/inetutils.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/inetutils.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
@@ -29,9 +31,4 @@
 <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
@@ -39,5 +36,5 @@
 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>
Index: chapter06/iproute2.xml
===================================================================
--- chapter06/iproute2.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/iproute2.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/kbd.xml
===================================================================
--- chapter06/kbd.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/kbd.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/less.xml
===================================================================
--- chapter06/less.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/less.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/libtool.xml
===================================================================
--- chapter06/libtool.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/libtool.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/linux-libc-headers.xml
===================================================================
--- chapter06/linux-libc-headers.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/linux-libc-headers.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/m4.xml
===================================================================
--- chapter06/m4.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/m4.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/make.xml
===================================================================
--- chapter06/make.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/make.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/man-pages.xml
===================================================================
--- chapter06/man-pages.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/man-pages.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/man.xml
===================================================================
--- chapter06/man.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/man.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/mktemp.xml
===================================================================
--- chapter06/mktemp.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/mktemp.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
@@ -34,5 +36,5 @@
 <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>
Index: chapter06/module-init-tools.xml
===================================================================
--- chapter06/module-init-tools.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/module-init-tools.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/ncurses.xml
===================================================================
--- chapter06/ncurses.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/ncurses.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/patch.xml
===================================================================
--- chapter06/patch.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/patch.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/perl.xml
===================================================================
--- chapter06/perl.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/perl.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/procps.xml
===================================================================
--- chapter06/procps.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/procps.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/psmisc.xml
===================================================================
--- chapter06/psmisc.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/psmisc.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/readline.xml
===================================================================
--- chapter06/readline.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/readline.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
@@ -34,5 +36,5 @@
 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>
Index: chapter06/sed.xml
===================================================================
--- chapter06/sed.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/sed.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/shadow.xml
===================================================================
--- chapter06/shadow.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/shadow.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/sysklogd.xml
===================================================================
--- chapter06/sysklogd.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/sysklogd.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
@@ -32,5 +34,5 @@
 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>
Index: chapter06/sysvinit.xml
===================================================================
--- chapter06/sysvinit.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/sysvinit.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/tar.xml
===================================================================
--- chapter06/tar.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/tar.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
@@ -32,5 +34,5 @@
 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>
Index: chapter06/texinfo.xml
===================================================================
--- chapter06/texinfo.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/texinfo.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/udev.xml
===================================================================
--- chapter06/udev.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/udev.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
Index: chapter06/util-linux.xml
===================================================================
--- chapter06/util-linux.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/util-linux.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
@@ -50,5 +52,5 @@
 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>
Index: chapter06/vim.xml
===================================================================
--- chapter06/vim.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/vim.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
@@ -50,5 +52,5 @@
 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>
Index: chapter06/zlib.xml
===================================================================
--- chapter06/zlib.xml	(revision e6b9ad305927119f7aa6a558f9f6f7c78b955510)
+++ chapter06/zlib.xml	(revision 3e36a78621937b7ba17d4ab83abff97f84325ef8)
@@ -2,5 +2,7 @@
 <!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">
