diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 65c100113..45fedb561 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -23,7 +23,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>binutils-2.15.91.0.1</para></listitem>
 <listitem><para>bison-1.875a</para></listitem>
 <listitem><para>flex-2.5.31</para></listitem>
-<listitem><para>gcc-3.4.1-20040625</para></listitem>
+<listitem><para>gcc-3.4.1</para></listitem>
 <listitem><para>glibc-2.3.4-20040529</para></listitem>
 <listitem><para>groff-1.19.1</para></listitem>
 <listitem><para>hotplug-2004_04_01</para></listitem>
@@ -77,6 +77,8 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>July 2, 2004 [winkie]: Upgraded to GCC 3.4.1.</para></listitem>
+
 <listitem><para>July 2, 2004 [winkie]: Updated the Udev permissions
 configuration to include the nvidia kernel modules.</para></listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 47a4a745f..7c8779b0e 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -119,7 +119,7 @@
 <varlistentry>
 <term>GCC (&gcc-version;) - ~27,000KB:</term>
 <listitem>
-<para><ulink url="ftp://gcc.gnu.org/pub/gcc/prerelease-3.4.1-20040625/gcc-3.4.1-20040625.tar.bz2"/></para>
+<para><ulink url="&freshmeat;gcc/"/></para>
 </listitem>
 </varlistentry>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 675456be0..6b068e1db 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-short-version;-no_fixincludes-1.patch"/></para>
+<para><ulink url="&patches-root;gcc-&gcc-version;-no_fixincludes-1.patch"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>GCC Specs Patch - 11 KB:</term>
 <listitem>
-<para><ulink url="&patches-root;gcc-&gcc-short-version;-specs-1.patch"/></para>
+<para><ulink url="&patches-root;gcc-&gcc-version;-specs-1.patch"/></para>
 </listitem>
 </varlistentry>
 
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index d391b7aad..637314c00 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -52,8 +52,8 @@ into a single <filename class="directory">gcc-&gcc-version;/</filename> subdirec
 
 <para>First correct a problem and make an essential adjustment:</para>
 
-<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>
+<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch
+patch -Np1 -i ../gcc-&gcc-version;-specs-1.patch</userinput></screen>
 
 <para>The first patch disables the GCC <command>fixincludes</command> 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 f1f5bbccd..218286a6d 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-short-version;-no_fixincludes-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch</userinput></screen>
 
 <para>Now apply a sed substitution that will suppress the installation of
 <filename class="libraryfile">libiberty.a</filename>. We want to use the version of
diff --git a/general.ent b/general.ent
index 27a3ee332..391982204 100644
--- a/general.ent
+++ b/general.ent
@@ -31,8 +31,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-20040625">
+<!ENTITY gcc-version "3.4.1">
 <!ENTITY gettext-version "0.14.1">
 <!ENTITY glibc-version "2.3.4-20040529">
 <!ENTITY grep-version "2.5.1">