diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 47b61df7a..2d72d6d90 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -124,7 +124,8 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
-<listitem><para>January 10, 2006 [ken]: Revert my move of mktemp.</para>
+<listitem><para>January 10, 2006 [ken]: Revert my move of mktemp and add a
+sed to correct gccbug.</para>
 </listitem>
 
 <listitem><para>January 7, 2006 [ken]: Alter the Perl instructions to
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index f2ac03ae9..b67e4ede7 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -52,6 +52,14 @@ to not require fixing, issue the following command to prevent the
 
 <screen><userinput>sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in</userinput></screen>
 
+<para>GCC provides a <command>gccbug</command> script which detects at
+compile time whether mktemp is present, and hardcodes the result in a test.
+This will cause the script to fall back to using less random names for
+temporary files.  We will be installing mktemp later, so the following sed
+will simulate its presence.</para>
+
+<screen>sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in</screen>
+
 <para>The GCC documentation recommends building GCC outside of the source
 directory in a dedicated build directory:</para>