diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 1e3b05a71..1684d5240 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,11 @@
     <listitem>
       <para>2011-01-23</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] Ignore failing tests in Man-DB as they're only due to
+          a change in Groff-1.21's warning output.  Fixes
+          <ulink url="&lfs-ticket-root;2823">#2823</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] Change password hashing from MD5 to SHA-512. Fixes
           <ulink url="&lfs-ticket-root;2814">#2814</ulink>.</para>
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index 393e3e2d3..28379a95e 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -82,7 +82,10 @@
 
    <para>To test the results, issue:</para>
 
-<screen><userinput remap="test">make check</userinput></screen>
+<screen><userinput remap="test">make -k check</userinput></screen>
+
+    <para>Note that 2 tests are known to fail as they rely on warnings output
+    from Groff, which changed slightly in Groff-1.21.</para>
 
     <para>Install the package:</para>