Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 594df26c58f68536608976c83f60b45b2f2cf04a)
+++ introduction/welcome/changelog.xml	(revision 0f0774aef13aa96d6b1da5c0228876fd2fdaedf3)
@@ -49,4 +49,16 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - Update to fontforge-20160404. Fixes
+          <ulink url="&blfs-ticket-root;7689">#7689</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to mutt-1.6.0. Fixes
+          <ulink url="&blfs-ticket-root;7687">#7687</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to xf86-video-ati-7.7.0. Fixes
+          <ulink url="&blfs-ticket-root;7695">#7695</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[igor] - Update to feh-2.15. Fixes
           <ulink url="&blfs-ticket-root;7709">#7709</ulink>.</para>
Index: networking/mailnews/mutt.xml
===================================================================
--- networking/mailnews/mutt.xml	(revision 594df26c58f68536608976c83f60b45b2f2cf04a)
+++ networking/mailnews/mutt.xml	(revision 0f0774aef13aa96d6b1da5c0228876fd2fdaedf3)
@@ -8,7 +8,7 @@
   <!ENTITY mutt-download-http " ">
   <!ENTITY mutt-download-ftp  "ftp://ftp.mutt.org/pub/mutt/mutt-&mutt-version;.tar.gz">
-  <!ENTITY mutt-md5sum        "7f25d27f3c7c82285ac07aac35f5f0f2">
+  <!ENTITY mutt-md5sum        "d05bb821d7040c61ba89b22d7c2bd388">
   <!ENTITY mutt-size          "3.8 MB">
-  <!ENTITY mutt-buildsize     "36 MB (plus a further 8MB for the PDF manual)">
+  <!ENTITY mutt-buildsize     "37 MB (plus a further 5MB for the PDF manual)">
   <!ENTITY mutt-time          "0.3 SBU (plus a further 0.2 SBU to build the PDF manual)">
 ]>
@@ -114,14 +114,4 @@
     <title>Installation of Mutt</title>
 
-    <note>
-      <para>This version of <application>Mutt</application> is a development
-      release.  The BLFS editors have determined that it provides a stable
-      program and fixes two issues in the current stable version of
-      <application>Mutt</application>: a segmentation fault that occurs under
-      certain conditions and a compilation problem when building with recent
-      versions of <application>GCC</application>.
-      </para>
-    </note>
-
     <para><application>Mutt</application> requires a group named
     <systemitem class="groupname">mail</systemitem>.  You can
@@ -146,14 +136,11 @@
 
 <screen><userinput>cp -v doc/manual.txt{,.shipped} &amp;&amp;
-./configure --prefix=/usr     \
-            --sysconfdir=/etc \
+./configure --prefix=/usr                           \
+            --sysconfdir=/etc                       \
             --with-docdir=/usr/share/doc/mutt-&mutt-version; \
-            --enable-pop      \
-            --enable-imap     \
-            --enable-hcache   \
-            --without-qdbm    \
-            --with-gdbm       \
-            --without-bdb     \
-            --without-tokyocabinet &amp;&amp;
+            --enable-external-dotlock               \
+            --enable-pop                            \
+            --enable-imap                           \
+            --enable-hcache                         &amp;&amp;
 make &amp;&amp;
 test -s doc/manual.txt || mv -v doc/manual.txt{.shipped,}</userinput></screen>
@@ -170,10 +157,23 @@
 <screen role='root'><userinput>make install</userinput></screen>
 
-    <para>If you generated the PDF manual, install it and the source TeX
-    file by issuing the following command as the
+    <para>If you generated the PDF manual, install it
+    by issuing the following command as the
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role='root'><userinput>install -v -m644 doc/manual.{pdf,tex} \
+<screen role='root'><userinput>install -v -m644 doc/manual.pdf \
     /usr/share/doc/mutt-&mutt-version;</userinput></screen>
+
+    <note>
+      <para>
+        If you used a DESTDIR method to only install to a temporary location as
+        a regular user (as part of a package menagement process), you will need
+        to run the following as the <systemitem class="username">root</systemitem>
+        user after completing the real install:
+      </para>
+
+<screen role="nodump"><userinput>chown root:mail /usr/bin/mutt_dotlock &amp;&amp;
+chmod -v 2755 /usr/bin/mutt_dotclock</userinput></screen>
+    </note>
+
 
   </sect2>
@@ -182,4 +182,8 @@
     <title>Command Explanations</title>
 
+    <para><parameter>--enable-external-dotlock</parameter>: In some circumstances
+    the mutt-dotlock program is not created. This switch ensures it is always
+    created.</para>
+
     <para><parameter>--enable-pop</parameter>: This switch enables
     POP3 support.</para>
@@ -190,16 +194,4 @@
     <para><parameter>--enable-hcache</parameter>: This switch enables
     header caching.</para>
-
-    <para><parameter>--without-qdbm</parameter>: This switch disables
-    <application>QDBM</application> as the header cache backend.</para>
-
-    <para><parameter>--without-tokyocabinet</parameter>: This switch disables
-    <application>Tokyo Cabinet</application> as the header cache backend.</para>
-
-    <para><parameter>--with-gdbm</parameter>: This switch enables
-    <application>GDBM</application> as the header cache backend.</para>
-
-    <para><parameter>--without-bdb</parameter>: This switch disables
-     <application>Berkeley DB</application> as the header cache backend.</para>
 
     <para><option>--enable-smtp</option>: This switch enables
@@ -216,8 +208,9 @@
     authentication.</para>
 
-    <para><option>--with-slang</option>: Use <application>S-Lang
-    </application> instead of <application>Ncurses</application>.</para>
-
-    <para><option>test -s doc/manual.txt || mv -v doc/manual.txt{.shipped,}</option>:
+    <!-- we do not normally list all possible switches. LFS installs ncurses.
+    <para><option>\-\-with-slang</option>: Use <application>S-Lang
+    </application> instead of <application>Ncurses</application>.</para> -->
+
+    <para><parameter>test -s doc/manual.txt || mv -v doc/manual.txt{.shipped,}</parameter>:
     if the text manual is now empty (<application>libxslt</application> is installed,
     but without any of the specified text browsers), restore it from the copy.</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 594df26c58f68536608976c83f60b45b2f2cf04a)
+++ packages.ent	(revision 0f0774aef13aa96d6b1da5c0228876fd2fdaedf3)
@@ -412,5 +412,5 @@
 <!ENTITY procmail-version             "3.22">
 <!ENTITY fetchmail-version            "6.3.26">
-<!ENTITY mutt-version                 "1.5.24">
+<!ENTITY mutt-version                 "1.6.0">
 <!ENTITY re-alpine-version            "2.03">
 
@@ -684,5 +684,5 @@
 <!ENTITY feh-version                  "2.15">
 <!--<!ENTITY fontforge-date               "2015-02-28">-->
-<!ENTITY fontforge-version            "20150824">
+<!ENTITY fontforge-version            "20160404">
 <!ENTITY gparted-version              "0.25.0">
 <!ENTITY gimp-version                 "2.8.16">
Index: x/installing/x7driver-ati.xml
===================================================================
--- x/installing/x7driver-ati.xml	(revision 594df26c58f68536608976c83f60b45b2f2cf04a)
+++ x/installing/x7driver-ati.xml	(revision 0f0774aef13aa96d6b1da5c0228876fd2fdaedf3)
@@ -8,11 +8,11 @@
   <!ENTITY radeon-marketing-names "&radeon-wiki;#Decoder_ring_for_engineering_vs_marketing_names">
 
-  <!ENTITY xorg-ati-driver-version "7.6.1">
+  <!ENTITY xorg-ati-driver-version "7.7.0">
 
   <!ENTITY xorg-ati-driver-download-http "&xorg-download-http;/driver/xf86-video-ati-&xorg-ati-driver-version;.tar.bz2">
   <!ENTITY xorg-ati-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-video-ati-&xorg-ati-driver-version;.tar.bz2">
-  <!ENTITY xorg-ati-driver-md5sum        "ede86cd3d1b1d8882f0aea61d9e924ed">
-  <!ENTITY xorg-ati-driver-size          "804 KB">
-  <!ENTITY xorg-ati-driver-buildsize     "10 MB">
+  <!ENTITY xorg-ati-driver-md5sum        "59bfe0feba875c5cd28b03766aaa3b98">
+  <!ENTITY xorg-ati-driver-size          "810 KB">
+  <!ENTITY xorg-ati-driver-buildsize     "20 MB">
   <!ENTITY xorg-ati-driver-time          "0.2 SBU">
 ]>
Index: xsoft/other/fontforge.xml
===================================================================
--- xsoft/other/fontforge.xml	(revision 594df26c58f68536608976c83f60b45b2f2cf04a)
+++ xsoft/other/fontforge.xml	(revision 0f0774aef13aa96d6b1da5c0228876fd2fdaedf3)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/&fontforge-version;/fontforge-&fontforge-version;.tar.gz">
+  <!ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/&fontforge-version;/fontforge-dist-&fontforge-version;.tar.gz">
   <!ENTITY fontforge-download-ftp  " ">
-  <!ENTITY fontforge-md5sum        "74c49c73822d642b0511718d8eeb2210">
+  <!ENTITY fontforge-md5sum        "db98d07cfee624c21d7d6ca37fe0ca14">
   <!ENTITY fontforge-size          "20 MB">
-  <!ENTITY fontforge-buildsize     "243 MB (without tests)">
-  <!ENTITY fontforge-time          "1.5 SBU (without tests)">
+  <!ENTITY fontforge-buildsize     "243 MB (plus an additional 1 MB for the tests)">
+  <!ENTITY fontforge-time          "1.7 SBU (plus an additional 0.2 SBU for the tests)">
 ]>
 
@@ -119,4 +119,13 @@
     <title>Installation of FontForge</title>
 
+    <note>
+      <para>
+        For this version there is a separate and much larger fontforge tarball
+        without the -dist- in its name, do not try to use that. The -dist- version
+        was created a few minutes later, but the version was typo'd and it will
+        untar to fontforge-2.0-20140101.
+      </para>
+    </note>
+
     <para>
       Install <application>FontForge</application> by running the following
@@ -124,6 +133,6 @@
     </para>
 
-<screen><userinput>sed -i 's%naist.jp/pub/NetBSD/packages%netbsd.org/pub/pkgsrc%' \
-  tests/Makefile.in &amp;&amp;
+<screen><userinput>sed -i 's/20140101/20160404/g' configure inc/fontforge-config.h \
+                               tests/package.m4 tests/testsuite
 ./configure --prefix=/usr     \
             --enable-gtk2-use \
@@ -134,4 +143,5 @@
     <para>
       To test the results, issue: <command>make check</command>.
+      This will download two ttf files.
     </para>
 
@@ -142,4 +152,5 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
+    <!-- seems to be ok now
     <note>
       <para>
@@ -154,5 +165,5 @@
 <screen role="root"><userinput>sed -e '/Exec/ s/fontforge/&amp; -new/' \
     -i /usr/share/applications/fontforge.desktop</userinput></screen>
-    </note>
+    </note>-->
 
   </sect2>
@@ -162,11 +173,11 @@
 
     <para>
-      <parameter>sed -i 's%naist.jp/pub/NetBSD/packages%netbsd.org/pub/pkgsrc%'</parameter>
-      The tests get the MunhwaGothic-Bold font - it is no longer at that mirror,
-      so use the primary NetBSD source.
-    </para>
-
-    <para>
-      <parameter>--enable-gtk2-use</parameter>: allows to use the GTK+2 graphics
+      <parameter>sed -i 's/20140101/20160404/g' ...</parameter> : This changes
+      the typo'd date, particularly in the pkgconfig files and the log from the
+      tests.
+    </para>
+
+    <para>
+      <parameter>--enable-gtk2-use</parameter>: uses the GTK+2 graphics
       instead of basic Xorg graphics.
     </para>
