diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 7a5f1d1b7..c871c6f9d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,9 @@
     <listitem>
       <para>2013-08-21</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Add a patch to fix a test failure in Texinfo.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Add a patch to fix an intermittent test failure in
           Automake.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 69c621636..68b19f37e 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -245,6 +245,10 @@
       <para>&perl-libc-patch;</para>
     </listitem>
 
+    <listitem>
+      <para>&texinfo-test-patch;</para>
+    </listitem>
+
   </itemizedlist>
 
   <itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index ce864f4d5..49c2e5078 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -116,6 +116,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Texinfo Test Patch - <token>&texinfo-test-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&texinfo-test-patch;"/></para>
+        <para>MD5 sum: <literal>&texinfo-test-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <!--<varlistentry>
       <term>Zlib fPIC Patch - <token>&zlib-fpic-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 517062461..73da0037a 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -41,6 +41,10 @@
   <sect2 role="installation">
     <title>Installation of Texinfo</title>
 
+    <para>Fix an incompatibility between the test suite and Perl-&perl-version;:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&texinfo-test-patch;</userinput></screen>
+
     <para>Prepare Texinfo for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/patches.ent b/patches.ent
index 6d93cc6c3..becc9e8e8 100644
--- a/patches.ent
+++ b/patches.ent
@@ -39,3 +39,7 @@
 <!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-1.patch">
 <!ENTITY readline-fixes-patch-md5 "3c185f7b76001d3d0af614f6f2cd5dfa">
 <!ENTITY readline-fixes-patch-size "1.3 KB">
+
+<!ENTITY texinfo-test-patch "texinfo-&texinfo-version;-test-1.patch">
+<!ENTITY texinfo-test-patch-md5 "c50d9319a471b6ebd98900b852f5fb38">
+<!ENTITY texinfo-test-patch-size "5.6 KB">