diff --git a/appendixa/glibc-down.xml b/appendixa/glibc-down.xml
index c2c7a15a1..8b6b10118 100644
--- a/appendixa/glibc-down.xml
+++ b/appendixa/glibc-down.xml
@@ -8,6 +8,5 @@ Glibc-linuxthreads (&glibc-version;):
 <ulink url="ftp://ftp.gnu.org/gnu/glibc/"/>
 
 Glibc Patch (&glibc-patch-version;):
-<ulink url="&ftp;/"/>
 <ulink url="&http;/"/></literallayout></para>
 </sect2>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 1cd08e032..c518fa37d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -14,6 +14,8 @@
 <listitem><para>bison-1.75</para></listitem>
 <listitem><para>e2fsprogs-1.32</para></listitem>
 <listitem><para>gcc-3.2.1</para></listitem>
+<listitem><para>glibc-2.3.1</para></listitem>
+<listitem><para>glibc-2.3.1.patch</para></listitem>
 <listitem><para>groff-1.18.1</para></listitem>
 <listitem><para>kbd-1.08</para></listitem>
 <listitem><para>less-378</para></listitem>
@@ -46,6 +48,9 @@
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>December 31st, 2002 [gerard]: Upgraded to
+Glibc-2.3.1</para></listitem>
+
 <listitem><para>December 31st, 2002 [gerard]: Chapter 05 - GCC: Removed
 nofixincludes patch and use the built-in
 <emphasis>install-no-fixedincludes</emphasis> make
diff --git a/chapter04/glibc-patch.xml b/chapter04/glibc-patch.xml
index b191d8846..50ef5073a 100644
--- a/chapter04/glibc-patch.xml
+++ b/chapter04/glibc-patch.xml
@@ -1,3 +1,2 @@
 Glibc Patch (&glibc-patch-version;) - &glibc-patch-size;:
-<ulink url="&ftp;/glibc-&glibc-patch-version;.patch"/>
 <ulink url="&http;/glibc-&glibc-patch-version;.patch"/>
diff --git a/chapter06/glibc-exp.xml b/chapter06/glibc-exp.xml
index 32dd6896e..2f34bc2ef 100644
--- a/chapter06/glibc-exp.xml
+++ b/chapter06/glibc-exp.xml
@@ -10,14 +10,16 @@ patch also replaces all occurrences of <emphasis>root</emphasis> with
 <emphasis>0</emphasis> in the <filename>login/Makefile</filename> file.
 This is done because Glibc itself isn't installed yet and therefore
 username to userid resolving isn't working yet, so a <userinput>chown root
-file</userinput> will fail, however it'll work fine if you use straight
+file</userinput> will fail, however it'll work fine if you use the numeric
 IDs.</para>
 
-<para>The patch also contains a few bug fixes and security fixes.  In
-particular it contains the "errlist", "dns resolver", "xdr_array", "calloc",
-"thread exit", "udivdi3", "math test", "restrict_arr" and "divbyzero" fixes
-which are documented at
-<ulink url="http://www.zipworld.com.au/~gschafer/lfs-tweaks.html"/>.</para>
+<para>Lastly, the patch also fixes a problem that causes statically linked
+binaries to crash that were linked against Glibc-2.2 libraries. This patch
+is only needed temporarily because we have static programs in <filename
+class="directory">/static/bin</filename> that might be linked against an
+older Glibc version (the one from the host distribution). We will install
+Glibc again at the end of this chapter to remove this patch so you'll have
+a pristine Glibc as the developers intended it.</para>
 
 <para><userinput>touch /etc/ld.so.conf:</userinput> One of the final steps
 of the Glibc installation is running ldconfig to update the dynamic loader
diff --git a/entities/glibc.ent b/entities/glibc.ent
index 5516dc61d..f9900182e 100644
--- a/entities/glibc.ent
+++ b/entities/glibc.ent
@@ -12,13 +12,13 @@
 <!ENTITY aa-glibc-dep SYSTEM "../appendixa/glibc-dep.xml">
 <!ENTITY aa-glibc-down SYSTEM "../appendixa/glibc-down.xml">
 
-<!ENTITY glibc-version "2.2.5">
+<!ENTITY glibc-version "2.3.1">
 <!ENTITY glibc-depversion "2.2.5">
 <!ENTITY glibc-contversion "2.2.5">
-<!ENTITY glibc-size "16,267 KB">
-<!ENTITY glibc-threads-size "221 KB">
-<!ENTITY glibc-patch-size "8 KB">
-<!ENTITY glibc-patch-version "2.2.5-2">
+<!ENTITY glibc-size "17,463 KB">
+<!ENTITY glibc-threads-size "238 KB">
+<!ENTITY glibc-patch-size "4 KB">
+<!ENTITY glibc-patch-version "2.3.1">
 <!ENTITY glibc-dir "glibc-&glibc-version;">
 <!ENTITY glibc-threads-dir "linuxthreads, linuxthreads_db">
 <!ENTITY glibc-package "glibc-&glibc-version;.tar.bz2">