diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 78915757e..56017f97b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,12 @@
     <listitem>
       <para>2010-06-27</para>
       <itemizedlist>
+         <listitem>
+           <para>[bdubbs] - Updated explanation of glibc timeout 
+           errors and added TIMEOUTFACTOR as a possible solution.
+           Fixes
+           <ulink url="&lfs-ticket-root;2683">#2683</ulink>.</para>
+         </listitem>
          <listitem>
            <para>[bdubbs] - Update installed programs lists.
            Thanks to Chris Staub for the patch.  Fixes
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 3227e5865..a21555caa 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -183,7 +183,10 @@ grep Error glibc-check-log</userinput></screen>
       </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.</para>
+        load, some tests can fail because of test timeouts being exceeded.
+        Modifying the make check command to set a TIMEOUTFACTOR is reported help
+        eliminate these errors (e.g. <command>TIMEOUTFACTOR=16
+        make -k check</command>).</para>
       </listitem>
     </itemizedlist>