diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 7e713a2f9..501c50318 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
2009-03-11
+
+ [matthew] - Upgraded to Glibc-2.9. Fixes
+ #2357.
+
[matthew] - Upgraded to Coreutils-7.1. Fixes
#2354.
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index f3cf0fdae..83c2c14ae 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -77,9 +77,9 @@
-
+
@@ -224,6 +224,10 @@
&gcc-startfiles-patch;
+
+ &glibc-ildoubl-test-fix-patch;
+
+
&grep-debian-patch;
@@ -282,6 +286,12 @@
coreutils-6.12-uname-1.patch
+
+ glibc-2.8-20080929-iconv_tests-1.patch
+
+
+ glibc-2.8-20080929-ildoubl_test-1.patch
+
grep-2.5.3-debian_fixes-1.patch
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 27a8d0b35..75d4b631b 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -90,14 +90,6 @@
-
- Glibc Iconv Test Fixes Patch - &glibc-iconv-test-fixes-patch-size;:
-
- Download:
- MD5 sum: &glibc-iconv-test-fixes-patch-md5;
-
-
-
Glibc Ildoubl Test Fix Patch - &glibc-ildoubl-test-fix-patch-size;:
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 3aaa0f9d1..9271af6d9 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -90,11 +90,9 @@ sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|" \
scripts/test-installation.pl
unset DL -->
- First apply two patches which correct failures in the test
- suite:
+ First apply a patch which corrects a failure in the test suite:
-patch -Np1 -i ../&glibc-iconv-test-fixes-patch;
-patch -Np1 -i ../&glibc-ildoubl-test-fix-patch;
+patch -Np1 -i ../&glibc-ildoubl-test-fix-patch;
The ldd shell script contains Bash-specific
diff --git a/packages.ent b/packages.ent
index 15af34fbf..0cc0d3688 100644
--- a/packages.ent
+++ b/packages.ent
@@ -187,10 +187,10 @@
-
-
-
-
+
+
+
+
diff --git a/patches.ent b/patches.ent
index 6224f9d19..91a8382db 100644
--- a/patches.ent
+++ b/patches.ent
@@ -44,10 +44,6 @@
-
-
-
-