Index: server/mail/dovecot.xml
===================================================================
--- server/mail/dovecot.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/mail/dovecot.xml	(revision 2df080642f5f192954dab18de2b5866b41ad220c)
@@ -8,8 +8,8 @@
   "http://www.dovecot.org/releases/&dovecot-major;.&dovecot-minor;/dovecot-&dovecot-version;.tar.gz">
   <!ENTITY dovecot-download-ftp  " ">
-  <!ENTITY dovecot-md5sum        "1e42eb3b69544c447ad882d7858f3630">
-  <!ENTITY dovecot-size          "4.9 MB">
-  <!ENTITY dovecot-buildsize     "257 MB (additional 14 MB for the tests)">
-  <!ENTITY dovecot-time          "1.3 SBU (additional 0.4 SBU for the tests)">
+  <!ENTITY dovecot-md5sum        "28c39ab78a20f00701c26960d9190cf0">
+  <!ENTITY dovecot-size          "4.8 MB">
+  <!ENTITY dovecot-buildsize     "286 MB (with tests)">
+  <!ENTITY dovecot-time          "2.1 SBU (with tests)">
 ]>
 
@@ -39,5 +39,5 @@
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -74,4 +74,13 @@
       </listitem>
     </itemizedlist>
+<!--
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/dovecot-&dovecot-version;-CVE_2015_3420-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>-->
 
     <bridgehead renderas="sect3">Dovecot Dependencies</bridgehead>
@@ -81,6 +90,8 @@
       <xref linkend="clucene"/>,
       <xref linkend="icu"/>,
+      <xref linkend="libcap-pam"/>,
       <xref linkend="linux-pam"/>,
-      <xref linkend="mariadb"/>,
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
+      <xref linkend="mitkrb"/> (for GSSAPI support),
       <xref linkend="openldap"/>,
       <xref linkend="openssl"/>,
@@ -173,4 +184,9 @@
       <option>--with-lucene</option>: This switch enables
       <application>CLucene</application> full text search support.
+    </para>
+
+    <para>
+      <option>--with-krb5</option>: This switch enables
+      GSSAPI authentication support.
     </para>
 
@@ -273,5 +289,6 @@
       <seglistitem>
         <seg>
-          doveadm, doveconf, dovecot, dsync, and various internal programs
+          doveadm, doveconf, dovecot, dsync (symbolic link), and various
+          internal programs
         </seg>
         <seg>
@@ -280,7 +297,5 @@
         <seg>
           /etc/dovecot,
-          /usr/include/dovecot,
-          /usr/lib/dovecot,
-          /usr/libexec/dovecot, and
+          /usr/{include,lib,libexec,share}/dovecot and
           /usr/share/doc/dovecot-&dovecot-version;
         </seg>
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/mail/exim.xml	(revision 2df080642f5f192954dab18de2b5866b41ad220c)
@@ -44,5 +44,5 @@
     under the GNU Public License.</para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: server/mail/postfix.xml
===================================================================
--- server/mail/postfix.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/mail/postfix.xml	(revision 2df080642f5f192954dab18de2b5866b41ad220c)
@@ -8,7 +8,7 @@
   <!ENTITY postfix-download-ftp
            "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-&postfix-version;.tar.gz">
-  <!ENTITY postfix-md5sum        "d1dc2c23011c222129db3d91aa4f312a">
+  <!ENTITY postfix-md5sum        "61caffae689c11d09b4c972a394ae3b1">
   <!ENTITY postfix-size          "4.1 MB">
-  <!ENTITY postfix-buildsize     "198 MB">
+  <!ENTITY postfix-buildsize     "194 MB">
   <!ENTITY postfix-time          "0.4 SBU">
 ]>
@@ -34,10 +34,10 @@
       The <application>Postfix</application> package contains a Mail Transport
       Agent (MTA). This is useful for sending email to other users of your host
-      machine. It can also be configured to be a central mail server for your
+      machine.  It can also be configured to be a central mail server for your
       domain, a mail relay agent or simply a mail delivery agent to your local
       Internet Service Provider.
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -80,5 +80,5 @@
     <para role="recommended">
       <xref linkend="db"/>,
-      <xref linkend="cyrus-sasl"/> and
+      <xref linkend="cyrus-sasl"/>, and
       <xref linkend="openssl"/>
     </para>
@@ -86,10 +86,10 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="icu"/> (for Email Address Internationalization (SMTPUTF8) support),
-      <xref linkend="mariadb"/>,
+      <xref linkend="icu"/> for Email Address Internationalization (SMTPUTF8) support,
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
       <xref linkend="openldap"/>,
       <xref linkend="pcre"/>,
       <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/> and
+      <xref linkend="sqlite"/>, and
       <ulink url="http://cr.yp.to/cdb.html">CDB</ulink> or
       <ulink url="http://www.corpit.ru/mjt/tinycdb.html">TinyCDB</ulink>
@@ -134,15 +134,9 @@
         The README files are formatted to be read with a pager like
         <application>Less</application> or <application>More</application>.
-        If you want to read them in a text editor, make them legible with a sed:
+        If you want to use a text editor, make them legible with the
+        following sed:
       </para>
 
 <screen><userinput>sed -i 's/.\x08//g' README_FILES/*</userinput></screen>
-
-      <para>
-        If you are running a Linux-4.x kernel, apply the following sed to
-        allow the <command>makedefs</command> script to recognize it:
-      </para>
-
-<screen><userinput>sed -i 's/Linux.3\*/Linux.[34]\*/' makedefs</userinput></screen>
 
       <para>
@@ -310,6 +304,6 @@
 
     <para>
-      <option>CCARGS="-DNO_EAI ..."</option>: This will turn off SMTPUTF8
-      support, for example if the rest of your email address infrastructure
+      <option>CCARGS="-DNO_EAI ..."</option>: this will turn off SMTPUTF8
+      support, for example  if the rest of your email address infrastructure
       cannot handle UTF-8 email addresses and message header values.
     </para>
@@ -437,7 +431,7 @@
       <seglistitem>
         <seg>
-          mailq, newaliases, postalias, postcat, postconf, postdrop, postfix,
-          postkick, postlock, postlog, postmap, postmulti, postqueue, postsuper,
-          and sendmail
+          mailq (symlink), newaliases (symlink), postalias, postcat, postconf,
+          postdrop, postfix, postkick, postlock, postlog, postmap, postmulti,
+          postqueue, postsuper, and sendmail
         </seg>
         <seg>
@@ -445,9 +439,7 @@
         </seg>
         <seg>
-          /etc/postfix,
-          /usr/lib/postfix,
-          /usr/share/doc/postfix-&postfix-version;,
-          /var/lib/postfix, and
-          /var/spool/postfix
+          /{etc,usr/lib}/postfix,
+          /usr/share/doc/postfix-&postfix-version; and
+          /var/{lib,spool}/postfix
         </seg>
       </seglistitem>
Index: server/mail/sendmail.xml
===================================================================
--- server/mail/sendmail.xml	(revision 51d044fd30d588ddbc6bcc3a06d9c8e7f4909992)
+++ server/mail/sendmail.xml	(revision 2df080642f5f192954dab18de2b5866b41ad220c)
@@ -35,5 +35,5 @@
     Transport Agent (MTA).</para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -74,7 +74,8 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="procmail"/>,
-      <ulink url="http://www.feep.net/nph/">nph</ulink>, and
-      <xref linkend="gs"/> (for creating PDF documentation)
+      <xref linkend="gs"/> (for creating PDF documentation),
+      <xref linkend="procmail"/> (the configuration proposed below requires
+      that <command>procmail</command> be present at run-time), and
+      <ulink url="http://www.feep.net/nph/">nph</ulink>
     </para>
 
@@ -190,5 +191,5 @@
 
     <para><command>sed ... devtools/OS/Linux</command>: The site.config.m4
-    does not honor a change to the man directory, so fix it in the OS 
+    does not honor a change to the man directory, so fix it in the OS
     definitions.</para>
 
