diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 3993192df..f60dc5239 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,11 @@
     <listitem>
       <para>2008-02-07</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Added a patch to fix a known issue in the Automake
+          test suite. Fixes
+          <ulink url="&lfs-ticket-root;2143">#2143</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgraded to Man-pages-2.77. Fixes
           <ulink url="&lfs-ticket-root;2142">#2142</ulink>.</para>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 5b05e0a95..54d639812 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -18,6 +18,14 @@
 
   <variablelist role="materials">
 
+    <varlistentry>
+      <term>Automake Test Suite Patch - <token>&automake-test-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&automake-test-patch;"/></para>
+        <para>MD5 sum: <literal>&automake-test-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index aeb683563..fefa708d1 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -41,6 +41,12 @@
   <sect2 role="installation">
     <title>Installation of Automake</title>
 
+    <para>Patch a test in the Automake test suite to fix an issue that occurs
+    when running the tests as <systemitem class="username">root</systemitem>:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&automake-test-patch;</userinput></screen>
+
     <para>Prepare Automake for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/patches.ent b/patches.ent
index e17024ea8..fa0ffceca 100644
--- a/patches.ent
+++ b/patches.ent
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!-- Start of Common Patches -->
+<!ENTITY automake-test-patch "automake-&automake-version;-test_fix-1.patch">
+<!ENTITY automake-test-patch-md5 "4d8aa269951bb3cd876d2bb663cb04cc">
+<!ENTITY automake-test-patch-size "3 KB">
+
+
 <!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-7.patch">
 <!ENTITY bash-fixes-patch-md5 "63ca4c26a1ae0c4a5b7da910d611d534">
 <!ENTITY bash-fixes-patch-size "55 KB">