diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 0ca3eee77..9e3767d73 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,15 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2006-08-17</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Fix a buffer overrun in m4-1.4.5 which causes two
+            of its tests to fail.  Thanks to Greg Schafer for the report.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>2006-08-08</para>
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index fe5c5a6a6..12379790c 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -34,6 +34,10 @@
   <sect2 role="installation">
     <title>Installation of M4</title>
 
+    <para>Fix a buffer overrun in m4:</para>
+
+<screen><userinput>sed -i -e '1660 s/break;/return;/' src/builtin.c</userinput></screen>
+
     <para>Prepare M4 for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>