Bringing order to the presentation of patches.

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

57 files changed, 169 insertions, 166 deletions

diff --git a/appendixa/bash-down.xml b/appendixa/bash-down.xml
index 7fad8054c..7833cb46d 100644
--- a/appendixa/bash-down.xml
+++ b/appendixa/bash-down.xml
@@ -4,7 +4,7 @@
 <para><literallayout>Bash (&bash-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/bash/"/>
 
-Bash Patch (&bash-version;):
-<ulink url="&patches-root;"/></literallayout></para>
+Bash Patch:
+<ulink url="&patches-root;&bash-patch;"/></literallayout></para>
 </sect2>
 
diff --git a/appendixa/bison-down.xml b/appendixa/bison-down.xml
index 4d47ad5eb..3ae8b0c31 100644
--- a/appendixa/bison-down.xml
+++ b/appendixa/bison-down.xml
@@ -4,7 +4,7 @@
 <para><literallayout>Bison (&bison-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/bison/"/>
 
-Bison Attribute Patch (&bison-version;):
-<ulink url="&patches-root;"/></literallayout></para>
+Bison Attribute Patch:
+<ulink url="&patches-root;&bison-patch;"/></literallayout></para>
 </sect2>
 
diff --git a/appendixa/coreutils-down.xml b/appendixa/coreutils-down.xml
index 8fcb17022..d701d132f 100644
--- a/appendixa/coreutils-down.xml
+++ b/appendixa/coreutils-down.xml
@@ -4,9 +4,9 @@
 <para><literallayout>Coreutils (&coreutils-version;):
 <ulink url="ftp://ftp.gnu.org/gnu/coreutils/"/>
 
-Coreutils Hostname Patch (&coreutils-version;):
-<ulink url="&patches-root;"/>
+Coreutils Hostname Patch:
+<ulink url="&patches-root;&coreutils-hostname-patch;"/>
 
-Coreutils Uname Patch (&coreutils-version;):
-<ulink url="&patches-root;"/></literallayout></para>
+Coreutils Uname Patch:
+<ulink url="&patches-root;&coreutils-uname-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/ed-down.xml b/appendixa/ed-down.xml
index 591492437..48c6e3df1 100644
--- a/appendixa/ed-down.xml
+++ b/appendixa/ed-down.xml
@@ -4,6 +4,6 @@
 <para><literallayout>Ed (&ed-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/ed/"/>
 
-Ed Patch (&ed-patch-version;):
-<ulink url="&patches-root;"/></literallayout></para>
+Ed Patch:
+<ulink url="&patches-root;&ed-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/expect-down.xml b/appendixa/expect-down.xml
index 53a6340f3..1a8512349 100644
--- a/appendixa/expect-down.xml
+++ b/appendixa/expect-down.xml
@@ -4,6 +4,6 @@
 <para><literallayout>Expect (&expect-version;):
 <ulink url="http://expect.nist.gov/src/"/>
 
-Expect Patch (&expect-patch-version;):
-<ulink url="&patches-root;"/></literallayout></para>
+Expect Patch:
+<ulink url="&patches-root;&expect-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/gawk-down.xml b/appendixa/gawk-down.xml
index 79a6ec546..609797873 100644
--- a/appendixa/gawk-down.xml
+++ b/appendixa/gawk-down.xml
@@ -4,6 +4,6 @@
 <para><literallayout>Gawk (&gawk-version;): 
 <ulink url="ftp://ftp.gnu.org/pub/gnu/gawk/"/>
 
-Gawk Patch (&gawk-patch-version;):
-<ulink url="&patches-root;"/></literallayout></para>
+Gawk Patch:
+<ulink url="&patches-root;&gawk-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/gcc-down.xml b/appendixa/gcc-down.xml
index 7ef567e0a..14d3a24a9 100644
--- a/appendixa/gcc-down.xml
+++ b/appendixa/gcc-down.xml
@@ -4,21 +4,24 @@
 <para><literallayout>GCC (&gcc-version;): 
 <ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/>
 
-GCC No Fixincludes Patch (&gcc-nofixincludes-patch-version;):
-<ulink url="&patches-root;"/>
+GCC No-Fixincludes Patch:
+<ulink url="&patches-root;&gcc-nofixincludes-patch;"/>
 
-GCC Specs Patch (&gcc-specs-patch-version;):
-<ulink url="&patches-root;"/>
+GCC Specs Patch:
+<ulink url="&patches-root;&gcc-specs-patch;"/>
 
-GCC Suppress Libiberty Patch (&gcc-suppress-libiberty-patch-version;):
-<ulink url="&patches-root;"/>
+GCC Suppress-Libiberty Patch:
+<ulink url="&patches-root;&gcc-suppress-libiberty-patch;"/>
 
-GCC-2 Patch (&gcc-2953-patch-version;):
-<ulink url="&patches-root;"/>
+GCC-2 (&gcc-2953-version;): 
+<ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/>
+
+GCC-2 Patch:
+<ulink url="&patches-root;&gcc-2953-patch;"/>
 
-GCC-2 No Fixincludes Patch (&gcc-2953-no-fixinc-patch-version;):
-<ulink url="&patches-root;"/>
+GCC-2 No-Fixincludes Patch:
+<ulink url="&patches-root;&gcc-2953-no-fixinc-patch;"/>
 
-GCC-2 Return Type Patch (&gcc-2953-returntype-fix-patch-version;):
-<ulink url="&patches-root;"/></literallayout></para>
+GCC-2 Return-Type Patch:
+<ulink url="&patches-root;&gcc-2953-returntype-fix-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/glibc-down.xml b/appendixa/glibc-down.xml
index 76fb1a03f..ddafc95ac 100644
--- a/appendixa/glibc-down.xml
+++ b/appendixa/glibc-down.xml
@@ -7,6 +7,6 @@
 Glibc-linuxthreads (&glibc-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/glibc/"/>
 
-Glibc Sscanf Patch (&glibc-sscanf-patch-version;):
-<ulink url="&patches-root;"/></literallayout></para>
+Glibc Sscanf Patch:
+<ulink url="&patches-root;&glibc-sscanf-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/grub-down.xml b/appendixa/grub-down.xml
index 9bf0308af..91fa69b6a 100644
--- a/appendixa/grub-down.xml
+++ b/appendixa/grub-down.xml
@@ -4,6 +4,6 @@
 <para><literallayout>Grub (&grub-version;):
 <ulink url="ftp://alpha.gnu.org/pub/gnu/grub/"/>
 
-Grub Gcc33 Patch (&grub-version;):
-<ulink url="&patches-root;"/></literallayout></para>
+Grub Gcc33 Patch:
+<ulink url="&patches-root;&grub-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/kbd-down.xml b/appendixa/kbd-down.xml
index af5e6c8d6..1530b0ed5 100644
--- a/appendixa/kbd-down.xml
+++ b/appendixa/kbd-down.xml
@@ -4,6 +4,6 @@
 <para><literallayout>Kbd (&kbd-version;): 
 <ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/"/>
 
-Kbd Patch (&kbd-patch-version;):
-<ulink url="&patches-root;"/></literallayout></para>
+Kbd Patch:
+<ulink url="&patches-root;&kbd-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/man-down.xml b/appendixa/man-down.xml
index 051da7ce4..d895501be 100644
--- a/appendixa/man-down.xml
+++ b/appendixa/man-down.xml
@@ -4,12 +4,12 @@
 <para><literallayout>Man (&man-version;): 
 <ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/"/>
 
-Man 80Cols Patch (&man-80cols-patch-version;):
-<ulink url="&patches-root;"/>
+Man 80-Columns Patch:
+<ulink url="&patches-root;&man-80cols-patch;"/>
 
-Man Manpath Patch (&man-manpath-patch-version;):
-<ulink url="&patches-root;"/>
+Man Manpath Patch:
+<ulink url="&patches-root;&man-manpath-patch;"/>
 
-Man Pager Patch (&man-pager-patch-version;):
-<ulink url="&patches-root;"/></literallayout></para>
+Man Pager Patch:
+<ulink url="&patches-root;&man-pager-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/ncurses-down.xml b/appendixa/ncurses-down.xml
index 8b900caf2..e40954b36 100644
--- a/appendixa/ncurses-down.xml
+++ b/appendixa/ncurses-down.xml
@@ -4,9 +4,9 @@
 <para><literallayout>Ncurses (&ncurses-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/ncurses/"/>
 
-Ncurses Etip Patch (&ncurses-version;):
-<ulink url="&patches-root;"/>
+Ncurses Etip Patch:
+<ulink url="&patches-root;&ncurses-etip-patch;"/>
 
-Ncurses Vsscanf Patch (&ncurses-version;):
-<ulink url="&patches-root;"/></literallayout></para>
+Ncurses Vsscanf Patch:
+<ulink url="&patches-root;&ncurses-vsscanf-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/nettools-down.xml b/appendixa/nettools-down.xml
index 85dc22fe6..46b1a9ede 100644
--- a/appendixa/nettools-down.xml
+++ b/appendixa/nettools-down.xml
@@ -4,6 +4,6 @@
 <para><literallayout>Net-tools (&net-tools-version;): 
 <ulink url="http://www.tazenda.demon.co.uk/phil/net-tools/"/>
 
-Net-tools Mii-Tool Patch (&net-tools-version;):
-<ulink url="&patches-root;"/></literallayout></para>
+Net-tools Mii-Tool-Gcc33 Patch:
+<ulink url="&patches-root;&net-tools-mii-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/perl-down.xml b/appendixa/perl-down.xml
index 9dddcfde5..4f81a78ea 100644
--- a/appendixa/perl-down.xml
+++ b/appendixa/perl-down.xml
@@ -4,6 +4,6 @@
 <para><literallayout>Perl (&perl-version;):
 <ulink url="http://www.perl.com/"/>
 
-Perl Libc Patch (&perl-version;):
-<ulink url="&patches-root;"/></literallayout></para>
+Perl Libc Patch:
+<ulink url="&patches-root;&perl-libc-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/procps-down.xml b/appendixa/procps-down.xml
index 2ad36e933..f13f9617a 100644
--- a/appendixa/procps-down.xml
+++ b/appendixa/procps-down.xml
@@ -4,6 +4,6 @@
 <para><literallayout>Procps (&procps-version;):
 <ulink url="http://procps.sourceforge.net/"/>
 
-Procps Patch (&procps-patch-version;):
-<ulink url="&patches-root;"/></literallayout></para>
+Procps Patch:
+<ulink url="&patches-root;&procps-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/shadowpwd-down.xml b/appendixa/shadowpwd-down.xml
index 4fc47854f..cacbafa37 100644
--- a/appendixa/shadowpwd-down.xml
+++ b/appendixa/shadowpwd-down.xml
@@ -4,6 +4,6 @@
 <para><literallayout>Shadow (&shadow-version;):
 <ulink url="ftp://ftp.pld.org.pl/software/shadow/"/>
 
-Shadow Newgrp Patch (&shadow-version;):
-<ulink url="&patches-root;"/></literallayout></para>
+Shadow Newgrp Patch:
+<ulink url="&patches-root;&shadow-patch;"/></literallayout></para>
 </sect2>
diff --git a/appendixa/zlib-down.xml b/appendixa/zlib-down.xml
index c15da3c45..c06568dcb 100644
--- a/appendixa/zlib-down.xml
+++ b/appendixa/zlib-down.xml
@@ -6,6 +6,6 @@
 <para><literallayout>Zlib (&zlib-version;):
 <ulink url="http://www.gzip.org/zlib/"/>
 
-Zlib Patch (&zlib-version;):
-<ulink url="&patches-root;"/></literallayout></para>
+Zlib Patch:
+<ulink url="&patches-root;&zlib-patch;"/></literallayout></para>
 </sect2>
diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml
index c4092747f..7b86380f6 100644
--- a/chapter04/chapter04.xml
+++ b/chapter04/chapter04.xml
@@ -248,91 +248,91 @@ or just make some small modifications to bend things our way. You'll need the
 following:</para>
 
 <literallayout>
-Bash Patch (&bash-patch-version;) - &bash-patch-size;:
-<ulink url="&patches-root;bash-&bash-patch-version;.patch"/>
+Bash Patch - &bash-patch-size;:
+<ulink url="&patches-root;&bash-patch;"/>
 
-Bison Attribute Patch (&bison-patch-version;) - &bison-patch-size;:
-<ulink url="&patches-root;bison-&bison-patch-version;.patch"/>
+Bison Attribute Patch - &bison-patch-size;:
+<ulink url="&patches-root;&bison-patch;"/>
 
-Coreutils Hostname Patch (&coreutils-hostname-patch-version;) - &coreutils-hostname-patch-size;:
-<ulink url="&patches-root;coreutils-&coreutils-hostname-patch-version;.patch"/>
+Coreutils Hostname Patch - &coreutils-hostname-patch-size;:
+<ulink url="&patches-root;&coreutils-hostname-patch;"/>
 
-Coreutils Uname Patch (&coreutils-uname-patch-version;) - &coreutils-uname-patch-size;:
-<ulink url="&patches-root;coreutils-&coreutils-uname-patch-version;.patch"/>
+Coreutils Uname Patch - &coreutils-uname-patch-size;:
+<ulink url="&patches-root;&coreutils-uname-patch;"/>
 
-Ed Patch (&ed-patch-version;) - &ed-patch-size;:
-<ulink url="&patches-root;ed-&ed-patch-version;.patch"/>
+Ed Patch - &ed-patch-size;:
+<ulink url="&patches-root;&ed-patch;"/>
 
-Expect Patch (&expect-patch-version;) - &expect-patch-size;:
-<ulink url="&patches-root;expect-&expect-patch-version;.patch"/>
+Expect Patch - &expect-patch-size;:
+<ulink url="&patches-root;&expect-patch;"/>
 
-Gawk Patch (&gawk-patch-version;) - &gawk-patch-size;:
-<ulink url="&patches-root;gawk-&gawk-patch-version;.patch"/>
+Gawk Patch - &gawk-patch-size;:
+<ulink url="&patches-root;&gawk-patch;"/>
 
-GCC No Fixincludes Patch: (&gcc-nofixincludes-patch-version;) - &gcc-nofixincludes-patch-size;:
-<ulink url="&patches-root;gcc-&gcc-nofixincludes-patch-version;.patch"/>
+GCC No-Fixincludes Patch - &gcc-nofixincludes-patch-size;:
+<ulink url="&patches-root;&gcc-nofixincludes-patch;"/>
 
-GCC Specs Patch: (&gcc-specs-patch-version;) - &gcc-specs-patch-size;:
-<ulink url="&patches-root;gcc-&gcc-specs-patch-version;.patch"/>
+GCC Specs Patch - &gcc-specs-patch-size;:
+<ulink url="&patches-root;&gcc-specs-patch;"/>
 
-GCC Suppress Libiberty Patch: (&gcc-suppress-libiberty-patch-version;) - &gcc-suppress-libiberty-patch-size;:
-<ulink url="&patches-root;gcc-&gcc-suppress-libiberty-patch-version;.patch"/>
+GCC Suppress-Libiberty Patch - &gcc-suppress-libiberty-patch-size;:
+<ulink url="&patches-root;&gcc-suppress-libiberty-patch;"/>
 
-GCC-2 Patch (&gcc-2953-patch-version;) - &gcc-2953-patch-size;:
-<ulink url="&patches-root;gcc-&gcc-2953-patch-version;.patch"/>
+GCC-2 Patch - &gcc-2953-patch-size;:
+<ulink url="&patches-root;&gcc-2953-patch;"/>
 
-GCC-2 No Fixincludes Patch (&gcc-2953-no-fixinc-patch-version;) - &gcc-2953-no-fixinc-patch-size;:
-<ulink url="&patches-root;gcc-&gcc-2953-no-fixinc-patch-version;.patch"/>
+GCC-2 No-Fixincludes Patch - &gcc-2953-no-fixinc-patch-size;:
+<ulink url="&patches-root;&gcc-2953-no-fixinc-patch;"/>
 
-GCC-2 Return Type Patch (&gcc-2953-returntype-fix-patch-version;) - &gcc-2953-returntype-fix-patch-size;:
-<ulink url="&patches-root;gcc-&gcc-2953-returntype-fix-patch-version;.patch"/>
+GCC-2 Return-Type Patch - &gcc-2953-returntype-fix-patch-size;:
+<ulink url="&patches-root;&gcc-2953-returntype-fix-patch;"/>
 
-Glibc Sscanf Patch: (&glibc-sscanf-patch-version;) - &glibc-sscanf-patch-size;:
-<ulink url="&patches-root;glibc-&glibc-sscanf-patch-version;.patch"/>
+Glibc Sscanf Patch - &glibc-sscanf-patch-size;:
+<ulink url="&patches-root;&glibc-sscanf-patch;"/>
 
-Grub Gcc33 Patch (&grub-patch-version;) - &grub-patch-size;:
-<ulink url="&patches-root;grub-&grub-patch-version;.patch"/>
+Grub Gcc33 Patch - &grub-patch-size;:
+<ulink url="&patches-root;&grub-patch;"/>
 
-Kbd Patch (&kbd-patch-version;) - &kbd-patch-size;:
-<ulink url="&patches-root;kbd-&kbd-patch-version;.patch"/>
+Kbd Patch - &kbd-patch-size;:
+<ulink url="&patches-root;&kbd-patch;"/>
 
-Man 80Cols Patch (&man-80cols-patch-version;) - &man-80cols-patch-size;:
-<ulink url="&patches-root;man-&man-80cols-patch-version;.patch"/>
+Man 80-Columns Patch - &man-80cols-patch-size;:
+<ulink url="&patches-root;&man-80cols-patch;"/>
 
-Man Manpath Patch (&man-manpath-patch-version;) - &man-manpath-patch-size;:
-<ulink url="&patches-root;man-&man-manpath-patch-version;.patch"/>
+Man Manpath Patch - &man-manpath-patch-size;:
+<ulink url="&patches-root;&man-manpath-patch;"/>
 
-Man Pager Patch (&man-pager-patch-version;) - &man-pager-patch-size;:
-<ulink url="&patches-root;man-&man-pager-patch-version;.patch"/>
+Man Pager Patch - &man-pager-patch-size;:
+<ulink url="&patches-root;&man-pager-patch;"/>
 
-Ncurses Etip Patch (&ncurses-etip-patch-version;) - &ncurses-etip-patch-size;:
-<ulink url="&patches-root;ncurses-&ncurses-etip-patch-version;.patch"/>
+Ncurses Etip Patch - &ncurses-etip-patch-size;:
+<ulink url="&patches-root;&ncurses-etip-patch;"/>
 
-Ncurses Vsscanf Patch (&ncurses-vsscanf-patch-version;) - &ncurses-vsscanf-patch-size;:
-<ulink url="&patches-root;ncurses-&ncurses-vsscanf-patch-version;.patch"/>
+Ncurses Vsscanf Patch - &ncurses-vsscanf-patch-size;:
+<ulink url="&patches-root;&ncurses-vsscanf-patch;"/>
 
-Net-tools Mii-Tool Gcc33 Patch (&net-tools-mii-patch-version;) - &net-tools-mii-patch-size;:
-<ulink url="&patches-root;net-tools-&net-tools-mii-patch-version;.patch"/>
+Net-tools Mii-Tool-Gcc33 Patch - &net-tools-mii-patch-size;:
+<ulink url="&patches-root;&net-tools-mii-patch;"/>
 
-Perl Libc Patch (&perl-libc-patch-version;) - &perl-libc-patch-size;:
-<ulink url="&patches-root;perl-&perl-libc-patch-version;.patch"/>
+Perl Libc Patch - &perl-libc-patch-size;:
+<ulink url="&patches-root;&perl-libc-patch;"/>
 
-Procps Patch (&procps-patch-version;) - &procps-patch-size;:
-<ulink url="&patches-root;procps-&procps-patch-version;.patch"/>
+Procps Patch - &procps-patch-size;:
+<ulink url="&patches-root;&procps-patch;"/>
 
-Shadow Newgrp Patch (&shadow-patch-version;) - &shadow-patch-size;:
-<ulink url="&patches-root;shadow-&shadow-patch-version;.patch"/> 
+Shadow Newgrp Patch - &shadow-patch-size;:
+<ulink url="&patches-root;&shadow-patch;"/> 
 
-Zlib Vsnprintf Patch (&zlib-patch-version;) - &zlib-patch-size;:
-<ulink url="&patches-root;zlib-&zlib-patch-version;.patch"/>
+Zlib Vsnprintf Patch - &zlib-patch-size;:
+<ulink url="&patches-root;&zlib-patch;"/>
 </literallayout>
 
-<para>In addition, there are a number of optional patches that have been
-created by the LFS community.  Most of these solve slight problems, or enable
-some functionality that's not enabled by default.  Please feel free to examine
-the patches database, located at
-<ulink url="http://www.linuxfromscratch.org/patches/"/>, and choose any
-additional patches you might wish to use.</para>
+<para>In addition to the above required patches, there exist a number of
+optional ones created by the LFS community. Most of these solve slight
+problems, or enable some functionality that's not enabled by default. Feel
+free to examine the patches database, located at
+<ulink url="http://www.linuxfromscratch.org/patches/"/>, and pick any
+additional patches you wish to use.</para>
 
 </sect1>
 
diff --git a/chapter05/bash-inst.xml b/chapter05/bash-inst.xml
index 89950f847..03fe846ae 100644
--- a/chapter05/bash-inst.xml
+++ b/chapter05/bash-inst.xml
@@ -6,7 +6,7 @@
 <para>Bash contains several known bugs. Fix these with the following
 patch:</para>
 
-<para><screen><userinput>patch -Np1 -i ../bash-&bash-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&bash-patch;</userinput></screen></para>
 
 <para>Now prepare Bash for compilation:</para>
 
diff --git a/chapter05/expect-inst.xml b/chapter05/expect-inst.xml
index e54a5b484..84e186da9 100644
--- a/chapter05/expect-inst.xml
+++ b/chapter05/expect-inst.xml
@@ -5,7 +5,7 @@
 
 <para>First apply a patch:</para>
 
-<para><screen><userinput>patch -Np1 -i ../expect-&expect-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&expect-patch;</userinput></screen></para>
 
 <para>This fixes a bug in Expect that can result in bogus failures during the
 GCC test suite run.</para>
diff --git a/chapter05/gcc-pass2-inst.xml b/chapter05/gcc-pass2-inst.xml
index 5ed463704..e2e58ab19 100644
--- a/chapter05/gcc-pass2-inst.xml
+++ b/chapter05/gcc-pass2-inst.xml
@@ -33,8 +33,8 @@ same working directory. They will all unfold into a single
 
 <para>First correct one problem and make an essential adjustment:</para>
 
-<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-nofixincludes-patch-version;.patch
-patch -Np1 -i ../gcc-&gcc-specs-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&gcc-nofixincludes-patch;
+patch -Np1 -i ../&gcc-specs-patch;</userinput></screen></para>
 
 <para>The first patch disables the GCC "fixincludes" script.  We mentioned this
 briefly earlier, but a slightly more in-depth explanation of the fixincludes 
diff --git a/chapter05/glibc-inst.xml b/chapter05/glibc-inst.xml
index a6f9340fd..7385f9809 100644
--- a/chapter05/glibc-inst.xml
+++ b/chapter05/glibc-inst.xml
@@ -31,7 +31,7 @@ touch /tools/etc/ld.so.conf</userinput></screen></para>
 <para>Also, Glibc has a subtle problem when compiled with GCC 3.3.1.
 Apply the following patch to fix this:</para>
 
-<para><screen><userinput>patch -Np1 -i ../glibc-&glibc-sscanf-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&glibc-sscanf-patch;</userinput></screen></para>
 
 <para>The Glibc documentation recommends building Glibc outside of the source
 directory in a dedicated build directory:</para>
diff --git a/chapter05/ncurses-inst.xml b/chapter05/ncurses-inst.xml
index 938be653f..7c187a2b5 100644
--- a/chapter05/ncurses-inst.xml
+++ b/chapter05/ncurses-inst.xml
@@ -5,8 +5,8 @@
 
 <para>Fix two minor things:</para>
 
-<para><screen><userinput>patch -Np1 -i ../ncurses-&ncurses-version;-etip-2.patch
-patch -Np1 -i ../ncurses-&ncurses-version;-vsscanf.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&ncurses-etip-patch;
+patch -Np1 -i ../&ncurses-vsscanf-patch;</userinput></screen></para>
 
 <para>The first patch corrects the <filename>etip.h</filename> header file, and
 the second patch prevents some compiler warnings being issued on the use of
diff --git a/chapter05/perl-inst.xml b/chapter05/perl-inst.xml
index 498ad5f69..297fe7aef 100644
--- a/chapter05/perl-inst.xml
+++ b/chapter05/perl-inst.xml
@@ -4,7 +4,7 @@
 
 <para>First adapt some hard-wired paths to the C library:</para>
 
-<para><screen><userinput>patch -Np1 -i ../perl-&perl-libc-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen></para>
 
 <para>And make sure some static extensions get built:</para>
 
diff --git a/chapter06/bash-inst.xml b/chapter06/bash-inst.xml
index 308a2dbea..339a670df 100644
--- a/chapter06/bash-inst.xml
+++ b/chapter06/bash-inst.xml
@@ -7,7 +7,7 @@
 way it is expected at times. Fix this behaviour with the following
 patch:</para>
 
-<para><screen><userinput>patch -Np1 -i ../bash-&bash-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&bash-patch;</userinput></screen></para>
 
 <para>Prepare Bash for compilation:</para>
 
diff --git a/chapter06/coreutils-inst.xml b/chapter06/coreutils-inst.xml
index 665caa7c6..7ef5a0a09 100644
--- a/chapter06/coreutils-inst.xml
+++ b/chapter06/coreutils-inst.xml
@@ -7,13 +7,13 @@
 broken, in that the <userinput>-p</userinput> switch always returns "unknown".
 The following patch fixes this behaviour for Intel architectures:</para>
 
-<para><screen><userinput>patch -Np1 -i ../coreutils-&coreutils-uname-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&coreutils-uname-patch;</userinput></screen></para>
 
 <para>We do not want Coreutils to install its version of the
 <userinput>hostname</userinput> program, because it is inferior to the version
 provided by Net-tools. Prevent its installation by applying a patch:</para>
 
-<para><screen><userinput>patch -Np1 -i ../coreutils-&coreutils-hostname-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&coreutils-hostname-patch;</userinput></screen></para>
 
 <para>Now prepare Coreutils for compilation:</para>
 
diff --git a/chapter06/ed-inst.xml b/chapter06/ed-inst.xml
index 0fa6d4d48..0cfe4f261 100644
--- a/chapter06/ed-inst.xml
+++ b/chapter06/ed-inst.xml
@@ -17,7 +17,7 @@ create temporary files.</para>
 
 <para>Apply the patch:</para>
 
-<para><screen><userinput>patch -Np1 -i ../ed-&ed-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&ed-patch;</userinput></screen></para>
 
 <para>Now prepare Ed for compilation:</para>
 
diff --git a/chapter06/gawk-inst.xml b/chapter06/gawk-inst.xml
index 1ac6525be..b804ef845 100644
--- a/chapter06/gawk-inst.xml
+++ b/chapter06/gawk-inst.xml
@@ -31,7 +31,7 @@ class="directory">$prefix/share/gawk-3.1.3</filename>) is removed along
 with its contents on a make uninstall.</para></listitem>
 </itemizedlist>
 
-<para><screen><userinput>patch -Np1 -i ../gawk-&gawk-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&gawk-patch;</userinput></screen></para>
 
 <para>Now prepare Gawk for compilation:</para>
 
diff --git a/chapter06/gcc-2953-inst.xml b/chapter06/gcc-2953-inst.xml
index e6531b560..3af7c987e 100644
--- a/chapter06/gcc-2953-inst.xml
+++ b/chapter06/gcc-2953-inst.xml
@@ -27,9 +27,9 @@ the system GCC already installed in <filename class="directory">/usr</filename>
 
 <para>Apply the patches and make a small adjustment:</para>
 
-<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-2953-patch-version;.patch
-patch -Np1 -i ../gcc-&gcc-2953-no-fixinc-patch-version;.patch
-patch -Np1 -i ../gcc-&gcc-2953-returntype-fix-patch-version;.patch
+<para><screen><userinput>patch -Np1 -i ../&gcc-2953-patch;.patch
+patch -Np1 -i ../&gcc-2953-no-fixinc-patch;.patch
+patch -Np1 -i ../&gcc-2953-returntype-fix-patch;.patch
 echo timestamp > gcc/cstamp-h.in</userinput></screen></para>
 
 <para>The GCC documentation recommends building GCC outside of the source
diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml
index 2be07056c..35e49751d 100644
--- a/chapter06/gcc-inst.xml
+++ b/chapter06/gcc-inst.xml
@@ -20,8 +20,8 @@ GCC-testsuite package. The full GCC package contains even more
 compilers. Instructions for building these can be found at
 <ulink url="&blfs-root;view/stable/general/gcc.html"/>.</para>
 
-<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-nofixincludes-patch-version;.patch
-patch -Np1 -i ../gcc-&gcc-suppress-libiberty-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&gcc-nofixincludes-patch;
+patch -Np1 -i ../&gcc-suppress-libiberty-patch;</userinput></screen></para>
 
 <para>The second patch here suppresses the installation of libiberty from GCC,
 as we will use the one provided by binutils instead. Be careful
diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml
index 95e6db1e4..9ac69ac01 100644
--- a/chapter06/glibc-inst.xml
+++ b/chapter06/glibc-inst.xml
@@ -20,7 +20,7 @@ flags.</para>
 
 <para>Then apply the same patch we used previously:</para>
                                                                                 
-<para><screen><userinput>patch -Np1 -i ../glibc-&glibc-sscanf-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&glibc-sscanf-patch;</userinput></screen></para>
 
 <para>The Glibc documentation recommends building Glibc outside of the source
 directory in a dedicated build directory:</para>
diff --git a/chapter06/grub-inst.xml b/chapter06/grub-inst.xml
index 650b76c0b..66ec995b0 100644
--- a/chapter06/grub-inst.xml
+++ b/chapter06/grub-inst.xml
@@ -11,7 +11,7 @@ Grub.</para>
 
 <para>Grub needs a patch to fix a compilation problem with GCC-3.3.1</para>
 
-<para><screen><userinput>patch -Np1 -i ../grub-&grub-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&grub-patch;</userinput></screen></para>
 
 <para>Prepare Grub for compilation:</para>
 
diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml
index 80ad275d6..e27d55b94 100644
--- a/chapter06/kbd-inst.xml
+++ b/chapter06/kbd-inst.xml
@@ -7,7 +7,7 @@
 <userinput>setvesablank</userinput> and <userinput>getunimap</userinput>) are
 not installed . The patch enables the compilation of these utilities:</para>
 
-<para><screen><userinput>patch -Np1 -i ../kbd-&kbd-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&kbd-patch;</userinput></screen></para>
 
 <para>Now prepare Kbd for compilation:</para>
 
diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml
index 958cce200..830ba1532 100644
--- a/chapter06/man-inst.xml
+++ b/chapter06/man-inst.xml
@@ -9,19 +9,19 @@
 <filename>man.conf</filename> file to prevent redundant results when using
  programs such as <userinput>whatis</userinput>:</para>
 
-<para><screen><userinput>patch -Np1 -i ../man-&man-manpath-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&man-manpath-patch;</userinput></screen></para>
 
 <para>The second patch adds the <emphasis>-R</emphasis> option to the
 <emphasis>PAGER</emphasis> variable so that escape sequences are
 handled properly:</para>
 
-<para><screen><userinput>patch -Np1 -i ../man-&man-pager-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&man-pager-patch;</userinput></screen></para>
 
 <para>The third and last patch prevents a problem when man pages not formatted
 with more than 80 columns are used in conjunction with recent releases of
 <userinput>groff</userinput>:</para>
 
-<para><screen><userinput>patch -Np1 -i ../man-&man-80cols-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&man-80cols-patch;</userinput></screen></para>
 
 <para>Now prepare Man for compilation:</para>
 
diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml
index 26cc70588..251a901c8 100644
--- a/chapter06/ncurses-inst.xml
+++ b/chapter06/ncurses-inst.xml
@@ -5,8 +5,8 @@
 
 <para>First fix two tiny bugs:</para>
 
-<para><screen><userinput>patch -Np1 -i ../ncurses-&ncurses-version;-etip-2.patch
-patch -Np1 -i ../ncurses-&ncurses-version;-vsscanf.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&ncurses-etip-patch;
+patch -Np1 -i ../&ncurses-vsscanf-patch;</userinput></screen></para>
 
 <para>The first patch corrects the <filename>etip.h</filename> header file, and
 the second patch prevents some compiler warnings on the use of deprecated
diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml
index 508b5ad42..3e8aa1035 100644
--- a/chapter06/procps-inst.xml
+++ b/chapter06/procps-inst.xml
@@ -6,7 +6,7 @@
 <para>First fix a locale problem that can crash <userinput>w</userinput> under
 certain locale settings:</para>
 
-<para><screen><userinput>patch -Np1 -i ../procps-&procps-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&procps-patch;</userinput></screen></para>
 
 <para>Now compile Procps:</para>
 
diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml
index 9e0069145..4fc389869 100644
--- a/chapter06/shadowpwd-inst.xml
+++ b/chapter06/shadowpwd-inst.xml
@@ -39,7 +39,7 @@ the package incorrectly assumes it is going to be located at
 it to fail.  The following patch (also appearing in Shadow's CVS code) fixes
 this problem.</para>
 
-<para><screen><userinput>patch -Np1 -i ../shadow-&shadow-patch-version;.patch
+<para><screen><userinput>patch -Np1 -i ../&shadow-patch;.patch
 </userinput></screen></para>
 
 <para>Now prepare Shadow for compilation:</para>
diff --git a/chapter06/zlib-inst.xml b/chapter06/zlib-inst.xml
index 21cd9bc7d..bef73c94c 100644
--- a/chapter06/zlib-inst.xml
+++ b/chapter06/zlib-inst.xml
@@ -7,7 +7,7 @@
 <emphasis>gzprintf()</emphasis> function, that, though difficult to take
 advantage of, should be taken care of by applying this patch:</para>
 
-<para><screen><userinput>patch -Np1 -i ../zlib-&zlib-patch-version;.patch</userinput></screen></para>
+<para><screen><userinput>patch -Np1 -i ../&zlib-patch;</userinput></screen></para>
 
 <para>Now prepare Zlib for compilation:</para>
 
diff --git a/entities/bash.ent b/entities/bash.ent
index 45fd23288..60f868c1f 100644
--- a/entities/bash.ent
+++ b/entities/bash.ent
@@ -20,7 +20,7 @@
 <!ENTITY bash-package "bash-&bash-version;.tar.bz2">
 <!ENTITY bash-size "1,910 KB">
 
-<!ENTITY bash-patch-version "2.05b-2">
+<!ENTITY bash-patch "bash-&bash-version;-2.patch">
 <!ENTITY bash-patch-size "7 KB">
 
 <!ENTITY bash-compsize-static "24 MB">
diff --git a/entities/bison.ent b/entities/bison.ent
index af7e94252..83f7601ef 100644
--- a/entities/bison.ent
+++ b/entities/bison.ent
@@ -16,7 +16,7 @@
 <!ENTITY bison-package "bison-&bison-version;.tar.bz2">
 <!ENTITY bison-size "796 KB">
 
-<!ENTITY bison-patch-version "1.875-attribute">
+<!ENTITY bison-patch "bison-&bison-version;-attribute.patch">
 <!ENTITY bison-patch-size "2 KB">
 
 <!ENTITY bison-compsize "6 MB">
diff --git a/entities/coreutils.ent b/entities/coreutils.ent
index 339d1c760..b0172cbc5 100644
--- a/entities/coreutils.ent
+++ b/entities/coreutils.ent
@@ -20,10 +20,10 @@
 <!ENTITY coreutils-package "coreutils-&coreutils-version;.tar.bz2">
 <!ENTITY coreutils-size "3,860 KB">
 
+<!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname.patch">
 <!ENTITY coreutils-uname-patch-size "1 KB">
-<!ENTITY coreutils-uname-patch-version "5.0-uname">
+<!ENTITY coreutils-hostname-patch "coreutils-&coreutils-version;-hostname-2.patch">
 <!ENTITY coreutils-hostname-patch-size "1 KB">
-<!ENTITY coreutils-hostname-patch-version "5.0-hostname-2">
 
 <!ENTITY coreutils-compsize-static "17 MB">
 <!ENTITY coreutils-time-static "0.8 SBU">
diff --git a/entities/ed.ent b/entities/ed.ent
index 6df9a6ec3..4a5660727 100644
--- a/entities/ed.ent
+++ b/entities/ed.ent
@@ -17,8 +17,8 @@
 <!ENTITY ed-package "ed-&ed-version;.tar.bz2">
 <!ENTITY ed-size "182 KB">
 
+<!ENTITY ed-patch "ed-&ed-version;.patch">
 <!ENTITY ed-patch-size "1 KB">
-<!ENTITY ed-patch-version "0.2">
 
 <!ENTITY ed-compsize "3 MB">
 <!ENTITY ed-time "0.1 SBU">
diff --git a/entities/expect.ent b/entities/expect.ent
index 63abf8b61..296a5c8c2 100644
--- a/entities/expect.ent
+++ b/entities/expect.ent
@@ -17,7 +17,7 @@
 <!ENTITY expect-package "expect-&expect-version;.tar.bz2">
 <!ENTITY expect-size "508 KB">
 
-<!ENTITY expect-patch-version "5.39.0">
+<!ENTITY expect-patch "expect-&expect-version;.patch">
 <!ENTITY expect-patch-size "6 KB">
 
 <!ENTITY expect-compsize-static "24 MB">
diff --git a/entities/gawk.ent b/entities/gawk.ent
index 6ccadf3be..702929f94 100644
--- a/entities/gawk.ent
+++ b/entities/gawk.ent
@@ -20,8 +20,8 @@
 <!ENTITY gawk-package "gawk-&gawk-version;.tar.bz2">
 <!ENTITY gawk-size "1,596 KB">
 
+<!ENTITY gawk-patch "gawk-&gawk-version;.patch">
 <!ENTITY gawk-patch-size "1 KB">
-<!ENTITY gawk-patch-version "3.1.3">
 
 <!ENTITY gawk-compsize-static "17 MB">
 <!ENTITY gawk-time-static "0.2 SBU">
diff --git a/entities/gcc-2953.ent b/entities/gcc-2953.ent
index 00864368e..0151e5689 100644
--- a/entities/gcc-2953.ent
+++ b/entities/gcc-2953.ent
@@ -17,11 +17,11 @@
 <!ENTITY gcc-2953-package "gcc-&gcc-2953-version;.tar.bz2">
 <!ENTITY gcc-2953-size "9,618 KB">
 
-<!ENTITY gcc-2953-patch-version "2.95.3-2">
+<!ENTITY gcc-2953-patch "gcc-&gcc-2953-version;-2.patch">
 <!ENTITY gcc-2953-patch-size "16 KB">
-<!ENTITY gcc-2953-no-fixinc-patch-version "2.95.3-no-fixinc">
+<!ENTITY gcc-2953-no-fixinc-patch "gcc-&gcc-2953-version;-no-fixinc.patch">
 <!ENTITY gcc-2953-no-fixinc-patch-size "1 KB">
-<!ENTITY gcc-2953-returntype-fix-patch-version "2.95.3-returntype-fix">
+<!ENTITY gcc-2953-returntype-fix-patch "gcc-&gcc-2953-version;-returntype-fix.patch">
 <!ENTITY gcc-2953-returntype-fix-patch-size "1 KB">
 
 
diff --git a/entities/gcc.ent b/entities/gcc.ent
index 39a33c664..92dc528a9 100644
--- a/entities/gcc.ent
+++ b/entities/gcc.ent
@@ -27,11 +27,11 @@
 <!ENTITY gcc-gpp-size "2,017 KB">
 <!ENTITY gcc-testsuite-size "1,033 KB">
 
-<!ENTITY gcc-nofixincludes-patch-version "3.3.1-no_fixincludes-2">
+<!ENTITY gcc-nofixincludes-patch "gcc-&gcc-version;-no_fixincludes-2.patch">
 <!ENTITY gcc-nofixincludes-patch-size "1 KB">
-<!ENTITY gcc-specs-patch-version "3.3.1-specs-2">
+<!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-2.patch">
 <!ENTITY gcc-specs-patch-size "10 KB">
-<!ENTITY gcc-suppress-libiberty-patch-version "3.3.1-suppress-libiberty">
+<!ENTITY gcc-suppress-libiberty-patch "gcc-&gcc-version;-suppress-libiberty.patch">
 <!ENTITY gcc-suppress-libiberty-patch-size "1 KB">
 
 <!ENTITY gcc-compsize-pass1-stage1 "326 MB">
diff --git a/entities/glibc.ent b/entities/glibc.ent
index 78a6677ef..eb473a6e4 100644
--- a/entities/glibc.ent
+++ b/entities/glibc.ent
@@ -25,7 +25,7 @@
 <!ENTITY glibc-size "13,064 KB">
 <!ENTITY glibc-threads-size "211 KB">
 
-<!ENTITY glibc-sscanf-patch-version "2.3.2-sscanf-1">
+<!ENTITY glibc-sscanf-patch "glibc-&glibc-version;-sscanf-1.patch">
 <!ENTITY glibc-sscanf-patch-size "2 KB">
 
 <!ENTITY glibc-compsize "369 MB">
diff --git a/entities/grub.ent b/entities/grub.ent
index b1a928801..b9d3df919 100644
--- a/entities/grub.ent
+++ b/entities/grub.ent
@@ -18,7 +18,7 @@
 <!ENTITY grub-package "grub-&grub-version;.tar.bz2">
 <!ENTITY grub-size "870 KB">
 
-<!ENTITY grub-patch-version "0.93-gcc33-1">
+<!ENTITY grub-patch "grub-&grub-version;-gcc33-1.patch">
 <!ENTITY grub-patch-size "1 KB">
 
 <!ENTITY grub-compsize "9 MB">
diff --git a/entities/kbd.ent b/entities/kbd.ent
index d8bebf62c..f3a5121f1 100644
--- a/entities/kbd.ent
+++ b/entities/kbd.ent
@@ -17,7 +17,7 @@
 <!ENTITY kbd-package "kbd-&kbd-version;.tar.bz2">
 <!ENTITY kbd-size "801 KB">
 
-<!ENTITY kbd-patch-version "1.08">
+<!ENTITY kbd-patch "kbd-&kbd-version;.patch">
 <!ENTITY kbd-patch-size "1 KB">
 
 <!ENTITY kbd-compsize "8 MB">
diff --git a/entities/libtool.ent b/entities/libtool.ent
index a13fc63d5..566976603 100644
--- a/entities/libtool.ent
+++ b/entities/libtool.ent
@@ -16,8 +16,8 @@
 <!ENTITY libtool-package "libtool-&libtool-version;.tar.bz2">
 <!ENTITY libtool-size "2,751 KB">
 
+<!ENTITY libtool-patch "libtool-&libtool-version;.patch">
 <!ENTITY libtool-patch-size "11 KB">
-<!ENTITY libtool-patch-version "1.4.2">
 
 <!ENTITY libtool-compsize "7 MB">
 <!ENTITY libtool-time "1.1 SBU">
diff --git a/entities/man.ent b/entities/man.ent
index 6d12ca1f0..352caa358 100644
--- a/entities/man.ent
+++ b/entities/man.ent
@@ -17,11 +17,11 @@
 <!ENTITY man-package "man-&man-version;.tar.bz2">
 <!ENTITY man-size "196 KB">
 
-<!ENTITY man-80cols-patch-version "1.5m2-80cols">
+<!ENTITY man-80cols-patch "man-&man-version;-80cols.patch">
 <!ENTITY man-80cols-patch-size "1 KB">
-<!ENTITY man-manpath-patch-version "1.5m2-manpath">
+<!ENTITY man-manpath-patch "man-&man-version;-manpath.patch">
 <!ENTITY man-manpath-patch-size "1 KB">
-<!ENTITY man-pager-patch-version "1.5m2-pager">
+<!ENTITY man-pager-patch "man-&man-version;-pager.patch">
 <!ENTITY man-pager-patch-size "1 KB">
 
 
diff --git a/entities/ncurses.ent b/entities/ncurses.ent
index a3b6cc7ed..2717598d5 100644
--- a/entities/ncurses.ent
+++ b/entities/ncurses.ent
@@ -20,9 +20,9 @@
 <!ENTITY ncurses-package "ncurses-&ncurses-version;.tar.bz2">
 <!ENTITY ncurses-size "2,019 KB">
 
-<!ENTITY ncurses-etip-patch-version "5.3-etip-2">
+<!ENTITY ncurses-etip-patch "ncurses-&ncurses-version;-etip-2.patch">
 <!ENTITY ncurses-etip-patch-size "1 KB">
-<!ENTITY ncurses-vsscanf-patch-version "5.3-vsscanf">
+<!ENTITY ncurses-vsscanf-patch "ncurses-&ncurses-version;-vsscanf.patch">
 <!ENTITY ncurses-vsscanf-patch-size "1 KB">
 
 <!ENTITY ncurses-compsize "22 MB">
diff --git a/entities/nettools.ent b/entities/nettools.ent
index 593424d5d..54eeec8b6 100644
--- a/entities/nettools.ent
+++ b/entities/nettools.ent
@@ -16,7 +16,7 @@
 <!ENTITY net-tools-package "net-tools-&net-tools-version;.tar.bz2">
 <!ENTITY net-tools-size "194 KB">
 
-<!ENTITY net-tools-mii-patch-version "1.60-miitool-gcc33-1">
+<!ENTITY net-tools-mii-patch "net-tools-&net-tools-version;-miitool-gcc33-1.patch">
 <!ENTITY net-tools-mii-patch-size "2 KB">
 
 <!ENTITY net-tools-compsize "5 MB">
diff --git a/entities/perl.ent b/entities/perl.ent
index 0a579eea7..71af5e446 100644
--- a/entities/perl.ent
+++ b/entities/perl.ent
@@ -20,7 +20,7 @@
 <!ENTITY perl-package "perl-&perl-version;.tar.bz2">
 <!ENTITY perl-size "10,765 KB">
 
-<!ENTITY perl-libc-patch-version "5.8.0-libc-3">
+<!ENTITY perl-libc-patch "perl-&perl-version;-libc-3.patch">
 <!ENTITY perl-libc-patch-size "1 KB">
 
 <!ENTITY perl-compsize-static "52 MB">
diff --git a/entities/procps.ent b/entities/procps.ent
index cdfda3146..010f4e488 100644
--- a/entities/procps.ent
+++ b/entities/procps.ent
@@ -17,7 +17,7 @@
 <!ENTITY procps-package "procps-&procps-version;.tar.bz2">
 <!ENTITY procps-size "242 KB">
 
-<!ENTITY procps-patch-version "3.1.11">
+<!ENTITY procps-patch "procps-&procps-version;.patch">
 <!ENTITY procps-patch-size "1 KB">
 
 <!ENTITY procps-compsize "2 MB">
diff --git a/entities/shadow.ent b/entities/shadow.ent
index 82b89f8a8..5c41eae92 100644
--- a/entities/shadow.ent
+++ b/entities/shadow.ent
@@ -17,7 +17,7 @@
 <!ENTITY shadow-package "shadow-&shadow-version;.tar.bz2">
 <!ENTITY shadow-size "760 KB">
 
-<!ENTITY shadow-patch-version "4.0.3-newgrp-fix">
+<!ENTITY shadow-patch "shadow-&shadow-version;-newgrp-fix.patch">
 <!ENTITY shadow-patch-size "1 KB">
 
 <!ENTITY shadow-compsize "7 MB">
diff --git a/entities/zlib.ent b/entities/zlib.ent
index 575874d86..e20ad827f 100644
--- a/entities/zlib.ent
+++ b/entities/zlib.ent
@@ -17,7 +17,7 @@
 <!ENTITY zlib-package "zlib-&zlib-version;.tar.bz2">
 <!ENTITY zlib-size "144 KB">
 
-<!ENTITY zlib-patch-version "1.1.4-vsnprintf">
+<!ENTITY zlib-patch "zlib-&zlib-version;-vsnprintf.patch">
 <!ENTITY zlib-patch-size "10 KB">
 
 <!ENTITY zlib-compsize "1 MB">