Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 0b657dc6f5987670a230804b8ac3c86bc4184db3)
+++ general/prog/git.xml	(revision f9f13ae273c15bc92e3e3a05806fa89d050db028)
@@ -117,7 +117,8 @@
     <para role="optional">
       <xref linkend="pcre"/>,
-      <xref linkend="subversion"/> with Perl bindings (for <command>git svn</command>), and
+      <xref linkend="subversion"/> with Perl bindings (for <command>git svn</command>),
       <xref linkend="tk"/> (gitk, a simple <application>Git</application>
-      repository viewer, uses <application>Tk</application> at runtime)
+      repository viewer, uses <application>Tk</application> at runtime), and
+      <xref linkend="valgrind"/>
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 0b657dc6f5987670a230804b8ac3c86bc4184db3)
+++ introduction/welcome/changelog.xml	(revision f9f13ae273c15bc92e3e3a05806fa89d050db028)
@@ -48,4 +48,8 @@
       <para>May 15th, 2015</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to dovecot-2.2.18. Fixes
+          <ulink url="&blfs-ticket-root;6505">#6505</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[fernando] - Update to php-5.6.9. Fixes
Index: packages.ent
===================================================================
--- packages.ent	(revision 0b657dc6f5987670a230804b8ac3c86bc4184db3)
+++ packages.ent	(revision f9f13ae273c15bc92e3e3a05806fa89d050db028)
@@ -409,5 +409,5 @@
 <!ENTITY dovecot-major                "2">
 <!ENTITY dovecot-minor                "2">
-<!ENTITY dovecot-micro                "16">
+<!ENTITY dovecot-micro                "18">
 <!ENTITY dovecot-version              "&dovecot-major;.&dovecot-minor;.&dovecot-micro;">
 
Index: server/mail/dovecot.xml
===================================================================
--- server/mail/dovecot.xml	(revision 0b657dc6f5987670a230804b8ac3c86bc4184db3)
+++ server/mail/dovecot.xml	(revision f9f13ae273c15bc92e3e3a05806fa89d050db028)
@@ -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        "8dba21e817b4239e462d98a925233418">
-  <!ENTITY dovecot-size          "4.6 MB">
-  <!ENTITY dovecot-buildsize     "235 MB">
-  <!ENTITY dovecot-time          "1.4 SBU (additional 0.5 SBU for the tests)">
+  <!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)">
 ]>
 
@@ -39,5 +39,5 @@
     </para>
 
-    &lfs77_checked; &gcc5_checked;
+    &lfs77_built; &gcc5_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -74,5 +74,5 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
@@ -82,5 +82,5 @@
         </para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist>-->
 
     <bridgehead renderas="sect3">Dovecot Dependencies</bridgehead>
@@ -89,4 +89,5 @@
     <para role="optional">
       <xref linkend="clucene"/>,
+      <xref linkend="icu"/>,
       <xref linkend="libcap-pam"/>,
       <xref linkend="linux-pam"/>,
@@ -96,6 +97,9 @@
       <xref linkend="openssl"/>,
       <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>, and
-      <xref linkend="valgrind"/>
+      <xref linkend="sqlite"/>,
+      <xref linkend="valgrind"/>,
+      <ulink url="https://cassandra.apache.org/">Cassandra</ulink>,
+      <ulink url="https://github.com/Cyan4973/lz4">lz4</ulink>, and
+      <ulink url="https://github.com/shibukawa/snowball_py">stemmer</ulink>
     </para>
 
@@ -126,6 +130,5 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../dovecot-&dovecot-version;-CVE_2015_3420-1.patch &amp;&amp;
-./configure --prefix=/usr \
+<screen><userinput>./configure --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
@@ -284,7 +287,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>
