Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision 201e34f4bcc9eb078f7c30b088553a17935f3061)
+++ server/mail/exim.xml	(revision 55ec717074bc96454a02de464b9c3fa891d09765)
@@ -13,7 +13,7 @@
   <!-- if above don't work, please use one of the official mirrors at
        http://www.exim.org/mirmon/ftp_mirrors.html -->
-  <!ENTITY exim-md5sum          "2effc2bd47ad2dc010f655c11a1b1173">
+  <!ENTITY exim-md5sum          "4cc10c910fd18bb9e299e98bc0a32ed2">
   <!ENTITY exim-size            "1.7 MB">
-  <!ENTITY exim-buildsize       "17 MB">
+  <!ENTITY exim-buildsize       "14 MB">
   <!ENTITY exim-time            "0.2 SBU">
 
@@ -82,4 +82,9 @@
     <para role="required">
       <xref linkend="pcre"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="openssl"/>
     </para>
 
@@ -95,8 +100,9 @@
       <ulink url="http://www.mysql.com/">MySQL</ulink>,
       <xref linkend="openldap"/>,
-      <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
+      <xref linkend="gnutls"/>,
       <xref linkend="postgresql"/>,
       <xref linkend="sqlite"/>,
-      <xref linkend="x-window-system"/>, and
+      <xref linkend="x-window-system"/>,
+      <ulink url="http://www.hl5.org">Heimdal GSSAPI</ulink>, and
       <ulink url="http://www.trusteddomain.org/opendmarc/">OpenDMARC</ulink>
     </para>
@@ -121,7 +127,9 @@
     commands:</para>
 
-<screen><userinput>sed -e 's,^BIN_DIR.*$,BIN_DIRECTORY=/usr/sbin,' \
+<screen><userinput>sed -e 's,^BIN_DIR.*$,BIN_DIRECTORY=/usr/sbin,'    \
     -e 's,^CONF.*$,CONFIGURE_FILE=/etc/exim.conf,' \
-    -e 's,^EXIM_USER.*$,EXIM_USER=exim,' \
+    -e 's,^EXIM_USER.*$,EXIM_USER=exim,'           \
+    -e '/SUPPORT_TLS/s,^#,,'                       \
+    -e '/USE_OPENSSL/s,^#,,'                       \
     -e 's,^EXIM_MONITOR,#EXIM_MONITOR,' src/EDITME > Local/Makefile &amp;&amp;
 printf "USE_GDBM = yes\nDBMLIB = -lgdbm\n" >> Local/Makefile &amp;&amp;
@@ -147,6 +155,6 @@
 
     <para><command>sed -e ... > Local/Makefile</command>: Most of
-    <application>Exim</application>'s configuration options are compiled in using
-    the directives in <filename>Local/Makefile</filename> which is created from
+    <application>Exim</application>'s configuration options are defined
+    in <filename>Local/Makefile</filename>, which is created from
     the <filename>src/EDITME</filename> file. This command specifies the minimum
     set of options. Descriptions for the options are listed below.</para>
@@ -169,4 +177,15 @@
     hands off the daemon to the <systemitem
     class="username">exim</systemitem> user.</para>
+
+    <para><parameter>SUPPORT_TLS=yes</parameter>: This allows to support
+    STARTTLS connexions. If you use this option, you need to select
+    whether <application>OpenSSL</application> or
+    <application>GnuTLS</application> is used (see
+    <filename>src/EDITME</filename>).</para>
+
+    <para><parameter>USE_OPENSSL_PC=openssl</parameter>: This tells the
+    build system to use <application>OpenSSL</application>, and to
+    find the needed libraries with <application>pkg-config</application>.
+    </para>
 
     <para><parameter>#EXIM_MONITOR</parameter>: This defers building the
@@ -212,5 +231,5 @@
     <option>WITH_CONTENT_SCAN=yes</option> parameter and review the information
     found at <ulink
-    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch41.html"/>.</para>
+    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch45.html"/>.</para>
 
     <para>To use a backend database other than <application>Berkeley
@@ -221,5 +240,5 @@
     url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch04.html#SECTinctlsssl"/>
     and <ulink
-    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch39.html"/>.</para>
+    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch42.html"/>.</para>
 
     <para>For <application>tcpwrappers</application> functionality, see the
@@ -228,5 +247,5 @@
 
     <para>For information about adding authentication mechanisms to the
-    build, see chapters 33-37 of <ulink
+    build, see chapters 33&mdash;41 of <ulink
     url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/index.html"/>.</para>
 
@@ -249,5 +268,8 @@
     <filename class='directory'>/var/spool/exim/log</filename> directory. See the
     information at <ulink
-    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch49.html"/>.</para>
+    url="http://exim.org/exim-html-&exim-version;/doc/html/spec_html/ch52.html"/>.</para>
+
+    <para>A wealth of information can be also found at the <ulink url=
+    "https://github.com/Exim/exim/wiki">Exim Wiki</ulink>.</para>
 
   </sect2>
