Index: networking/mailnews/mutt.xml
===================================================================
--- networking/mailnews/mutt.xml	(revision 8763a1da487a8acc8c699e40f909b9b3a3300fa7)
+++ networking/mailnews/mutt.xml	(revision 7e39ba3973263e24ed265d9548f9a6ed6ed05b22)
@@ -7,9 +7,9 @@
 <!--  <!ENTITY mutt-download-http "&sourceforge-repo;/mutt/mutt-&mutt-version;.tar.gz">-->
   <!ENTITY mutt-download-http " ">
-  <!ENTITY mutt-download-ftp  "ftp://ftp.mutt.org/mutt/mutt-&mutt-version;.tar.gz">
-  <!ENTITY mutt-md5sum        "11f5b6a3eeba1afa1257fe93c9f26bff">
-  <!ENTITY mutt-size          "3.7 MB">
+  <!ENTITY mutt-download-ftp  "ftp://ftp.mutt.org/pub/mutt/mutt-&mutt-version;.tar.gz">
+  <!ENTITY mutt-md5sum        "7f25d27f3c7c82285ac07aac35f5f0f2">
+  <!ENTITY mutt-size          "3.8 MB">
   <!ENTITY mutt-buildsize     "36 MB (plus a further 8MB for the PDF manual)">
-  <!ENTITY mutt-time          "0.7 SBU (plus a further 0.2SBU to regenerate the html if the required dependencies are present, and 0.2 SBU to build the PDF manual)">
+  <!ENTITY mutt-time          "0.3 SBU (plus a further 0.2 SBU to build the PDF manual)">
 ]>
 
@@ -35,5 +35,5 @@
     deleting your email.</para>
 
-    &lfs77_checked; &gcc5_checked;
+    &gcc5_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -59,5 +59,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <!--<bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
       <listitem>
@@ -66,5 +66,5 @@
         </para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist>-->
 
     <bridgehead renderas="sect3">Mutt Dependencies</bridgehead>
@@ -120,7 +120,6 @@
       <application>Mutt</application>: a segmentation fault that occurs under
       certain conditions and a compilation problem when building with recent
-      versions of <application>GCC</application>.  To find the current
-      stable release, please refer to the
-      <ulink url="http://www.mutt.org/">Mutt home page</ulink>.</para>
+      versions of <application>GCC</application>.
+      </para>
     </note>
 
@@ -137,8 +136,14 @@
 <screen role="root"><userinput>chgrp -v mail /var/mail</userinput></screen>
 
+    <para><application>Mutt</application> will rebuild the html documentation
+    if <application>libxslt</application> is present, then use that to update
+    the text manual - even if none of the specified browsers are present. That
+    will create an empty text file, so we will save the shipped file.
+    </para>
+
     <para>Install <application>Mutt</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../mutt-&mutt-version;-upstream_fixes-1.patch &amp;&amp;
+<screen><userinput>cp -v doc/manual.txt{,.shipped} &amp;&amp;
 ./configure --prefix=/usr     \
             --sysconfdir=/etc \
@@ -151,13 +156,6 @@
             --without-bdb     \
             --without-tokyocabinet &amp;&amp;
-make</userinput></screen>
-
-    <!-- for the moment, the html is regenerated automatically if the deps are
-    present, there is no way to stop it except by removing a dependency
-    <para>If you have the necessary dependencies installed and would like
-    to rebuild the HTML documentation, issue the following commands:</para>
-
-<screen><userinput>make -C doc clean &amp;&amp;
-make -C doc</userinput></screen> -->
+make &amp;&amp;
+test -s doc/manual.txt || mv -v doc/manual.txt{.shipped,}</userinput></screen>
 
     <para>To generate the PDF manual with <xref linkend="texlive"/>, run
@@ -220,4 +218,8 @@
     <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>:
+    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>
 
   </sect2>
