diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 7821ff274..3b46cf96a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -30,7 +30,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>flex-2.5.31</para></listitem>
 <listitem><para>gcc-3.4.0</para></listitem>
 <listitem><para>gettext-0.14.1</para></listitem>
-<listitem><para>glibc-2.3.4-20040408</para></listitem>
+<listitem><para>glibc-2.3.4-20040510</para></listitem>
 <listitem><para>grub-0.94</para></listitem>
 <listitem><para>kbd-1.12</para></listitem>
 <listitem><para>less-382</para></listitem>
@@ -44,7 +44,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>psmisc-21.4</para></listitem>
 <listitem><para>sed-4.0.9</para></listitem>
 <listitem><para>shadow-4.0.4.1</para></listitem>
-<listitem><para>tar-1.13.94</para></listitem>
+<listitem><para>tar-1.14</para></listitem>
 <listitem><para>tcl-8.4.6</para></listitem>
 <listitem><para>texinfo-4.7</para></listitem>
 <listitem><para>util-linux-2.12a</para></listitem>
@@ -94,6 +94,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>May 11th, 2004 [winkie]: Upgraded to Glibc 2.3.4-20040510 and
+Tar 1.14.</para></listitem>
+
 <listitem><para>May 10th, 2004 [winkie]: Chapter 8 - Upgraded to Linux 2.6.6.
 </para></listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index d4431f064..f1d1cd06b 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -343,7 +343,7 @@
 <varlistentry>
 <term>Tar (&tar-version;) - 1,025 KB:</term>
 <listitem>
-<para><ulink url="ftp://alpha.gnu.org/gnu/tar/"/></para>
+<para><ulink url="&freshmeat;tar/"/></para>
 </listitem>
 </varlistentry>
 
@@ -403,14 +403,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-20040408 -D "18:00:00 2004-04-08 UTC" libc
-sed -i -e "s/stable/2004-04-08/" -e "s/2\.3\.3/2.3.4/" \
-    glibc-2.3.4-20040408/version.h
-tar jcvf glibc-2.3.4-20040408.tar.bz2 glibc-2.3.4-20040408</userinput></screen>
+    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>
 
 <para>Alternatively, we've made our own tarball available which you can download
 from the following location:
-<ulink url="ftp://belfs.linux-phreak.net/belfs/glibc-2.3.4-20040408.tar.bz2"/>
+<ulink url="ftp://gaosu.rave.org/pub/linux/lfs/packages/conglomeration/glibc-2.3.4-20040510.tar.bz2"/>
 </para>
 </note>
 
diff --git a/general.ent b/general.ent
index a8f5412ed..a13bf6372 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "CVS-20040510">
-<!ENTITY releasedate "May 10, 2004">
+<!ENTITY version "CVS-20040511">
+<!ENTITY releasedate "May 11, 2004">
 <!ENTITY milestone "6.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
@@ -34,7 +34,7 @@
 <!ENTITY gawk-version "3.1.3">
 <!ENTITY gcc-version "3.4.0">
 <!ENTITY gettext-version "0.14.1">
-<!ENTITY glibc-version "2.3.4-20040408">
+<!ENTITY glibc-version "2.3.4-20040510">
 <!ENTITY grep-version "2.5.1">
 <!ENTITY groff-version "1.19">
 <!ENTITY grub-version "0.94">
@@ -63,7 +63,7 @@
 <!ENTITY shadow-version "4.0.4.1">
 <!ENTITY sysklogd-version "1.4.1">
 <!ENTITY sysvinit-version "2.85">
-<!ENTITY tar-version "1.13.94">
+<!ENTITY tar-version "1.14">
 <!ENTITY tcl-version "8.4.6">
 <!ENTITY texinfo-version "4.7">
 <!ENTITY util-linux-version "2.12a">