diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c5412bb18..a7224f6ec 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2013-01-02</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Groff-1.22.1.  Fixes
+          <ulink url="&lfs-ticket-root;3266">#3266</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Automake-1.13.1.  Fixes
           <ulink url="&lfs-ticket-root;3265">#3265</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index ada4bd7da..d9cf0839a 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -94,9 +94,9 @@
     <!--<listitem>
       <para>Grep &grep-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Groff &groff-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>GRUB &grub-version;</para>
     </listitem>-->
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index dbe24a882..315c3230c 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -41,16 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Groff</title>
 
-    <!-- It looks like many screen fonts still don't have Unicode single quotes
-    and dashes in them, but the sed below no longer makes any changes as the
-    format has changed in Groff-1.20.1 -->
-
-<!--    <para>Many screen fonts don't have Unicode single quotes and dashes in them.
-    Tell Groff to use the ASCII equivalents instead:</para>
-
-<screen><userinput remap="pre">sed -i -e 's/2010/002D/' -e 's/2212/002D/' \
-    -e 's/2018/0060/' -e 's/2019/0027/' font/devutf8/R.proto</userinput></screen> -->
-
     <para>Groff expects the environment variable <envar>PAGE</envar> to
     contain the default paper size. For users in the United States,
     <parameter>PAGE=letter</parameter> is appropriate. Elsewhere,
@@ -59,7 +49,12 @@
     by echoing either <quote>A4</quote> or <quote>letter</quote> to the
     <filename>/etc/papersize</filename> file.</para>
 
-    <para>Prepare Groff for compilation:</para>
+    <para>First, fix a bug in a Makefile, that prevents a symlink to a PDF from
+being created correctly:</para>
+
+<screen><userinput remap="pre">sed -i -e '163 s/$(DESTDIR)//' contrib/mom/Makefile.sub</userinput></screen>
+
+    <para>Now, prepare Groff for compilation:</para>
 
 <screen><userinput remap="configure">PAGE=<replaceable>&lt;paper_size&gt;</replaceable> ./configure --prefix=/usr</userinput></screen>
 
@@ -71,7 +66,8 @@
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">mkdir -p /usr/share/doc/groff-1.22/pdf
+make install</userinput></screen>
 
     <para>Some documentation programs, such as <command>xman</command>,
     will not work properly without the following symlinks:</para>
diff --git a/packages.ent b/packages.ent
index a2aa3744a..608962241 100644
--- a/packages.ent
+++ b/packages.ent
@@ -228,10 +228,10 @@
 <!ENTITY grep-ch6-du "30 MB">
 <!ENTITY grep-ch6-sbu "0.4 SBU">
 
-<!ENTITY groff-version "1.21">
-<!ENTITY groff-size "3,774 KB">
+<!ENTITY groff-version "1.22.1">
+<!ENTITY groff-size "3,920 KB">
 <!ENTITY groff-url "&gnu;groff/groff-&groff-version;.tar.gz">
-<!ENTITY groff-md5 "8b8cd29385b97616a0f0d96d0951c5bf">
+<!ENTITY groff-md5 "875c9c628b8b78a0c325000a43ebb964">
 <!ENTITY groff-home "&gnu-software;groff/">
 <!ENTITY groff-ch6-du "83 MB">
 <!ENTITY groff-ch6-sbu "0.5 SBU">