diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 789d07aef..10c17218b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
2013-03-28
+
+ [matthew] - Upgrade to Binutils-2.23.2. Fixes
+ #3318.
+
[matthew] - Upgrade to Systemd-199. Fixes
#3317.
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 0f26c9a85..588c4e244 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -37,9 +37,9 @@
-
+
@@ -247,6 +247,10 @@
bash-4.2-fixes-11.patch
+
+ binutils-2.23.1-testsuite_fix-1.patch
+
+
perl-5.16.2-libc-1.patch
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 9007b10eb..d5cb55391 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -26,14 +26,6 @@
-
- Binutils Test Suite Patch - &binutils-testsuite-fixes-patch-size;:
-
- Download:
- MD5 sum: &binutils-testsuite-fixes-patch-md5;
-
-
-
Bzip2 Documentation Patch - &bzip2-docs-patch-size;:
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 0cca873ef..e7194d81c 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -64,9 +64,11 @@ Ask your system administrator to create more.
rm -fv etc/standards.info
sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in
- Fix some test suite scripts so all tests pass:
+ Fix a couple of syntax errors that prevent the documentation from
+ building with Texinfo-&texinfo-version;:
-patch -Np1 -i ../&binutils-testsuite-fixes-patch;
+sed -i -e 's/@colophon/@@colophon/' \
+ -e 's/doc@cygnus.com/doc@@cygnus.com/' bfd/doc/bfd.texinfo
The Binutils documentation recommends building Binutils outside of the
source directory in a dedicated build directory:
diff --git a/packages.ent b/packages.ent
index 2c1353070..a29bdcbd8 100644
--- a/packages.ent
+++ b/packages.ent
@@ -34,10 +34,10 @@
-
-
+
+
-
+
diff --git a/patches.ent b/patches.ent
index 0b5277c4d..5ad0d7bc3 100644
--- a/patches.ent
+++ b/patches.ent
@@ -6,10 +6,6 @@
-
-
-
-