diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a0d92952d..b31a63dad 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,11 @@
     <listitem>
       <para>May 27, 2006</para>
       <itemizedlist>
+        <listitem>
+          <para>[jhuntwork] - Remove the 'refer back's in the gcc-pass2 and
+          chapter06/gcc pages. Better organizes the commands and data so that
+	  the flow of the book is not lost.</para>
+        </listitem>
         <listitem>
           <para>[jhuntwork] - Add a note about installing spell files for
           Vim in a language other than English.</para>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index be0411450..451cd5424 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -190,35 +190,18 @@ cd ../gcc-build</userinput></screen>
     <para>The <parameter>-k</parameter> flag is used to make the test suite run
     through to completion and not stop at the first failure. The GCC test
     suite is very comprehensive and is almost guaranteed to generate a few
-    failures. To receive a summary of the test suite results, run:</para>
+    failures.</para>
 
-<screen><userinput>../gcc-&gcc-version;/contrib/test_summary</userinput></screen>
-
-    <para>For only the summaries, pipe the output through
-    <userinput>grep -A7 Summ</userinput>.</para>
-
-    <para>Results can be compared with those located at <ulink
-    url="&test-results;"/>.</para>
-
-    <para>A few unexpected failures cannot always be avoided. The GCC developers
-    are usually aware of these issues, but have not resolved them yet. In
-    particular, the <filename class="libraryfile">libmudflap</filename> tests
-    are known be particularly problematic as a result of a bug in GCC
-    (<ulink url="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20003"/>).
-    Unless the test results are vastly different from those at the above URL,
-    it is safe to continue.</para>
+    <para>For a discussion of test failures that are of particular
+    importance, please see <xref linkend="ch-system-gcc" role="."/></para>
 
     <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-    <note>
-      <para>At this point it is strongly recommended to repeat the sanity
-      check we performed earlier in this chapter. Refer back to <xref
-      linkend="ch-tools-adjusting" role=","/> and repeat the test compilation.
-      If the result is wrong, the most likely reason is that the GCC Specs
-      patch was not properly applied.</para>
-    </note>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="adjusting.xml"
+    xpointer="xpointer(/sect1/caution[1])"/>
 
   </sect2>
 
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index b9ea377c9..41754d817 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -92,10 +92,23 @@ cd ../gcc-build</userinput></screen>
 
 <screen><userinput>make -k check</userinput></screen>
 
-    <para>Some of the errors are known issues and were noted in the
-    previous chapter. The test suite notes from <xref
-    linkend="ch-tools-gcc-pass2" role=","/> are still relevant here. Be sure to
-    refer back to them as necessary.</para>
+    <para>To receive a summary of the test suite results, run:</para>
+
+<screen><userinput>../gcc-&gcc-version;/contrib/test_summary</userinput></screen>
+
+    <para>For only the summaries, pipe the output through
+    <userinput>grep -A7 Summ</userinput>.</para>
+
+    <para>Results can be compared with those located at <ulink
+    url="&test-results;"/>.</para>
+
+    <para>A few unexpected failures cannot always be avoided. The GCC developers
+    are usually aware of these issues, but have not resolved them yet. In
+    particular, the <filename class="libraryfile">libmudflap</filename> tests
+    are known be particularly problematic as a result of a bug in GCC
+    (<ulink url="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20003"/>).
+    Unless the test results are vastly different from those at the above URL,
+    it is safe to continue.</para>
 
     <para>Install the package:</para>