diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9a20a52d0..f110bacc1 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -28,9 +28,9 @@ first a summary, then a detailed log.</para>
 <listitem><para>expect-5.41.0</para></listitem>
 <listitem><para>file-4.09</para></listitem>
 <listitem><para>flex-2.5.31</para></listitem>
-<listitem><para>gcc-3.4.1-20040517</para></listitem>
+<listitem><para>gcc-3.4.1-20040601</para></listitem>
 <listitem><para>gettext-0.14.1</para></listitem>
-<listitem><para>glibc-2.3.4-20040510</para></listitem>
+<listitem><para>glibc-2.3.4-20040529</para></listitem>
 <listitem><para>groff-1.19.1</para></listitem>
 <listitem><para>grub-0.94</para></listitem>
 <listitem><para>hotplug-2004_04_01</para></listitem>
@@ -102,6 +102,11 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>June 2nd, 2004 [winkie]: Upgraded to GCC 3.4.1-20040601. This
+release fixes bugs with reference to both GCC 3.4.0 and GCC 3.4.1-20040517. Also
+upgraded to Glibc 2.3.4-20040529 which includes lots of fixes for non-x86
+architectures.</para></listitem>
+
 <listitem><para>June 1st, 2004 [winkie]: Upgraded to Binutils 2.15.91.0.1. This
 release provides the <quote>-z relro</quote> option.</para></listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index aefccb6fd..71a030eda 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://gaosu.rave.org/pub/linux/lfs/packages/conglomeration/gcc-3.4.1-20040517.tar.bz2"/></para>
+<para><ulink url="ftp://gaosu.rave.org/pub/linux/lfs/packages/conglomeration/gcc-3.4.1-20040601.tar.bz2"/></para>
 </listitem>
 </varlistentry>
 
@@ -410,14 +410,14 @@ url="ftp://gaosu.rave.org/pub/linux/lfs/"/>.</para></note>
 so create a tarball of some known-good CVS with the following commands:</para>
 
 <screen><userinput>cvs -z 3 -d :pserver:anoncvs@sources.redhat.com:/cvs/glibc \
-    export -d glibc-2.3.4-20040510 -D "14:45:00 2004-05-10 UTC" libc
-sed -i -e "s/stable/2004-05-10/" -e "s/2\.3\.3/2.3.4/" \
-    glibc-2.3.4-20040510/version.h
-tar jcvf glibc-2.3.4-20040510.tar.bz2 glibc-2.3.4-20040510</userinput></screen>
+    export -d glibc-2.3.4-20040529 -D "2004-05-29 22:30 UTC" libc
+sed -i -e "s/stable/2004-05-29/" -e "s/2\.3\.3/2.3.4/" \
+    glibc-2.3.4-20040529/version.h
+tar jcvf glibc-2.3.4-20040529.tar.bz2 glibc-2.3.4-20040529</userinput></screen>
 
 <para>Alternatively, we've made our own tarball available which you can download
 from the following location:
-<ulink url="ftp://gaosu.rave.org/pub/linux/lfs/packages/conglomeration/glibc-2.3.4-20040510.tar.bz2"/>
+<ulink url="ftp://gaosu.rave.org/pub/linux/lfs/packages/conglomeration/glibc-2.3.4-20040529.tar.bz2"/>
 </para>
 </note>
 
diff --git a/general.ent b/general.ent
index fbe642887..302d25e19 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "CVS-20040601">
-<!ENTITY releasedate "June, 2004">
+<!ENTITY version "CVS-20040602">
+<!ENTITY releasedate "June 2nd, 2004">
 <!ENTITY milestone "6.0">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
@@ -32,9 +32,9 @@
 <!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 gcc-version "3.4.1-20040601">
 <!ENTITY gettext-version "0.14.1">
-<!ENTITY glibc-version "2.3.4-20040510">
+<!ENTITY glibc-version "2.3.4-20040529">
 <!ENTITY grep-version "2.5.1">
 <!ENTITY groff-version "1.19.1">
 <!ENTITY grub-version "0.94">