diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e1964cced..b7ed025f4 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
     <listitem>
       <para>2012-08-22</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update glibc text removing noatime mount 
+          caution and text regarding test issues.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Fix packaging for udev-lfs tarball.</para>
         </listitem>
diff --git a/chapter02/mounting.xml b/chapter02/mounting.xml
index a3dfcc689..09378afc8 100644
--- a/chapter02/mounting.xml
+++ b/chapter02/mounting.xml
@@ -44,9 +44,9 @@ mount -v -t ext3 /dev/<replaceable>&lt;yyy&gt;</replaceable> $LFS/usr</userinput
   <replaceable>&lt;yyy&gt;</replaceable> with the appropriate partition
   names.</para>
 
-  <para>Ensure that this new partition is not mounted with permissions that
-  are too restrictive (such as the <option>nosuid</option>, <option>nodev</option>,
-  or <option>noatime</option> options). Run the <command>mount</command> command
+  <para>Ensure that this new partition is not mounted with permissions that are
+  too restrictive (such as the <option>nosuid</option> or
+  <option>nodev</option> options). Run the <command>mount</command> command
   without any parameters to see what options are set for the mounted LFS
   partition. If <option>nosuid</option>, <option>nodev</option>, and/or
   <option>noatime</option> are set, the partition will need to be
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 05607b344..5f90ad46a 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -48,7 +48,7 @@
 
 <screen><userinput remap="pre">mkdir -v ../glibc-build
 cd ../glibc-build</userinput></screen>
-
+<!--
     <para>Because Glibc no longer supports i386, its developers say to use the
     compiler flag <parameter>-march=i486</parameter> when building it for x86
     machines. There are several ways to accomplish that, but testing shows that
@@ -62,7 +62,7 @@ cd ../glibc-build</userinput></screen>
 <screen><userinput remap="configure">case `uname -m` in
   i?86) echo "CFLAGS += -march=i486 -mtune=native" &gt; configparms ;;
 esac</userinput></screen>
-
+-->
     <para>Fix an issue when building Glibc-&glibc-version; with GCC-&gcc-version;:</para>
 
 <screen><userinput remap="pre">sed -i 's/ -lgcc_s//' ../glibc-&glibc-version;/Makeconfig</userinput></screen>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 20da07e9d..c9aa82bec 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -108,7 +108,7 @@ unset DL</userinput></screen>-->
 
 <screen><userinput remap="pre">mkdir -v ../glibc-build
 cd ../glibc-build</userinput></screen>
-
+<!--
     <para>As in Chapter 5, add the needed compiler flags to CFLAGS for x86 machines.
     Here, the optimization of the library is also set for the gcc compiler to
     enhance compilation speed (-pipe) and package performance (-O3).</para>
@@ -116,7 +116,7 @@ cd ../glibc-build</userinput></screen>
 <screen><userinput remap="configure">case `uname -m` in
   i?86) echo "CFLAGS += -march=i486 -mtune=native -O3 -pipe" &gt; configparms ;;
 esac</userinput></screen>
-
+-->
     <para>Prepare Glibc for compilation:</para>
 
 <screen><userinput remap="configure">../glibc-&glibc-version;/configure  \
@@ -150,18 +150,19 @@ esac</userinput></screen>
       Do not skip it under any circumstance.</para>
     </important>
 
-    <para>Before running the tests, copy a file from the source tree into our
-    build tree to prevent a couple of test failures, then test the
-    results:</para>
+    <para>Generally a few tests do not pass, but you can generally ignore
+    any of the test failures listed below. Now test the build results:</para>
 
-<screen><userinput remap="test">cp -v ../glibc-&glibc-version;/iconvdata/gconv-modules iconvdata
-make -k check 2&gt;&amp;1 | tee glibc-check-log
+<!-- cp -v ../glibc-&glibc-version;/iconvdata/gconv-modules iconvdata -->
+
+<screen><userinput remap="test">make -k check 2&gt;&amp;1 | tee glibc-check-log
 grep Error glibc-check-log</userinput></screen>
 
     <para>You will probably see an expected (ignored) failure in the
-    <emphasis>posix/annexc</emphasis> test.  In addition the Glibc test suite
-    is somewhat dependent on the host system.  This is a list of the most
-    common issues:</para>
+    <emphasis>posix/annexc</emphasis> and
+    <emphasis>conform/run-conformtest</emphasis> tests.  In addition the Glibc
+    test suite is somewhat dependent on the host system.  This is a list of the
+    most common issues:</para>
 
     <itemizedlist>
       <!-- Check again after updating from gcc-4.1.x -->
@@ -170,27 +171,32 @@ grep Error glibc-check-log</userinput></screen>
         using the 4.1 series of GCC.</para>
       </listitem> -->
       <!-- Was true in glibc-2.3.6, rt/tst-cpuclock2 in glibc-2.11.1 -->
-      <listitem>
 
+      <listitem>
         <para>The <emphasis>nptl/tst-clock2</emphasis>,
-        <emphasis>nptl/tst-attr3</emphasis>, and 
+        <emphasis>nptl/tst-attr3</emphasis>, 
+        <emphasis>tst/tst-cputimer1</emphasis>, and 
         <emphasis>rt/tst-cpuclock2</emphasis>
         tests have been known to fail.  The
         reason is not completely understood, but indications are that minor
         timing issues can trigger these failures.</para>
-      
       </listitem>
+
       <listitem>
         <para>The math tests sometimes fail when running on
         systems where the CPU is not a relatively new genuine Intel or
         authentic AMD processor.</para>
       </listitem>
+      
+      <!--
       <listitem>
         <para>If you have mounted the LFS partition with the
         <parameter>noatime</parameter> option, the <emphasis>atime</emphasis>
         test will fail. As mentioned in <xref linkend="space-mounting"/>, do not
         use the <parameter>noatime</parameter> option while building LFS.</para>
       </listitem>
+      -->
+      
       <listitem>
         <para>When running on older and slower hardware or on systems under
         load, some tests can fail because of test timeouts being exceeded.
@@ -198,10 +204,12 @@ grep Error glibc-check-log</userinput></screen>
         help eliminate these errors (e.g. <command>TIMEOUTFACTOR=16
         make -k check</command>).</para>
       </listitem>
+      
       <listitem>
         <para>Other tests known to fail on some architectures are posix/bug-regex32, 
         misc/tst-writev, elf/check-textrel, nptl/tst-getpid2, and stdio-common/bug22.</para>
       </listitem>
+    
     </itemizedlist>
 
     <para>Though it is a harmless message, the install stage of Glibc will