diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 478769af8..d6dff290a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
     <listitem>
       <para>2008-10-11</para>
       <itemizedlist>
+        <listitem>
+          <para>[dj] - Removed the chapter 5 glibc test suite information as
+          it requires a working C++ compiler to run.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Added three configure parameters to the Chapter 6
           Util-linux-ng instructions so that additional programs are
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 790f3973a..6bd5d6aad 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -43,12 +43,6 @@
   <sect2 role="installation">
     <title>Installation of Glibc</title>
 
-    <para>Though not mandatory in this chapter, if you plan on running the test
-    suite, you should apply the following patches:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-iconv-test-fixes-patch;
-patch -Np1 -i ../&glibc-ildoubl-test-fix-patch;</userinput></screen>
-
     <para>The Glibc documentation recommends building Glibc outside of the source
     directory in a dedicated build directory:</para>
 
@@ -163,31 +157,8 @@ cd ../glibc-build</userinput></screen>
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>Compilation is now complete. As mentioned earlier, running the
-    test suites for the temporary tools installed in this chapter is not
-    mandatory. To run the Glibc test suite (if desired), the following
-    commands will do so:</para>
-
-<screen><userinput remap="test">cp -v ../glibc-&glibc-version;/iconvdata/gconv-modules iconvdata
-make check</userinput></screen>
-
-    <para>For a discussion of test failures that are of particular
-    importance, please see <xref linkend="ch-system-glibc" role="."/></para>
-
-    <para>In this chapter, some tests can be adversely affected by
-    existing tools or environmental issues on the host system. Glibc test
-    suite failures in this chapter are typically not worrisome. The Glibc
-    installed in <xref linkend="chapter-building-system"/> is the one that
-    will ultimately end up being used, so that is the one that needs to pass
-    most tests (even in <xref linkend="chapter-building-system"/>, some
-    failures could still occur, for example, with the math tests).</para>
-
-    <para>When experiencing a failure, make a note of it, then continue by
-    reissuing the <command>make check</command> command. The test suite
-    should pick up where it left off and continue. This stop-start sequence
-    can be circumvented by issuing a <command>make -k check</command> command.
-    If using this option, be sure to log the output so that the log file can
-    be examined for failures later.</para>
+    <para>This package does come with a test suite, however, it cannot be
+    run at this time because we do not have a C++ compiler yet.</para>
 
     <para>The install stage of Glibc will issue a harmless warning at the
     end about the absence of <filename>/tools/etc/ld.so.conf</filename>.