diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 41984b3bf..c8d6d87c8 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -99,6 +99,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>May 20th, 2004 [winkie]: Point to the correct GCC patches.
+</para></listitem>
+
 <listitem><para>May 20th, 2004 [alexander]: Added Hotplug 2004_04_01.
 </para></listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index edb28a192..5e6fe72bd 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -52,14 +52,14 @@ following:</para>
 <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-&gcc-short-version;-no-fixincludes-1.patch"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>GCC Specs Patch - 11 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;gcc-&gcc-version;-specs-1.patch"/></para>
+<para><ulink url="&patches-root;gcc-&gcc-short-version;-specs-1.patch"/></para>
 </listitem>
 </varlistentry>
 
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index f2bff6f2a..a9e08a20b 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -52,8 +52,8 @@ into a single <filename>gcc-&gcc-version;/</filename> subdirectory.</para>
 
 <para>First correct a 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-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../gcc-&gcc-short-version;-no-fixincludes-1.patch
+patch -Np1 -i ../gcc-&gcc-short-version;-specs-1.patch</userinput></screen>
 
 <para>The first patch disables the GCC <quote>fixincludes</quote> script. We
 mentioned this briefly earlier, but a slightly more in-depth explanation of
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index c6ed50188..74e7ad3fc 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -44,7 +44,7 @@ compilers. Instructions for building these can be found at
 <para>First apply only the No-Fixincludes patch (and <emphasis>not</emphasis>
 the Specs patch) also used in the previous chapter:</para>
 
-<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no-fixincludes-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../gcc-&gcc-short-version;-no-fixincludes-1.patch</userinput></screen>
 
 <para>Now apply a sed substitution that will suppress the installation of
 <filename>libiberty.a</filename>. We want to use the version of
diff --git a/general.ent b/general.ent
index 4aec7892f..739e2232d 100644
--- a/general.ent
+++ b/general.ent
@@ -32,6 +32,7 @@
 <!ENTITY findutils-version "4.1.20">
 <!ENTITY flex-version "2.5.31">
 <!ENTITY gawk-version "3.1.3">
+<!ENTITY gcc-short-version "3.4.1">
 <!ENTITY gcc-version "3.4.1-20040517">
 <!ENTITY gettext-version "0.14.1">
 <!ENTITY glibc-version "2.3.4-20040510">