diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 24af52db13..708a4304e4 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,10 @@
     <listitem>
       <para>September 16th, 2023</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to dovecot-2.3.21. Fixes
+          <ulink url="&blfs-ticket-root;18564">#18564</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Update to postgresql-16.0. Fixes
           <ulink url="&blfs-ticket-root;18559">#18559</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index aff77d9071..99bf7b403c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -732,7 +732,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!-- Chapter 21 -->
 <!ENTITY dovecot-major                "2">
 <!ENTITY dovecot-minor                "3">
-<!ENTITY dovecot-micro                "20">
+<!ENTITY dovecot-micro                "21">
 <!ENTITY dovecot-nano                 "0">
 <!--<!ENTITY dovecot-version              "&dovecot-major;.&dovecot-minor;.&dovecot-micro;.&dovecot-nano;">-->
 <!ENTITY dovecot-version              "&dovecot-major;.&dovecot-minor;.&dovecot-micro;">
diff --git a/server/mail/dovecot.xml b/server/mail/dovecot.xml
index 02c57486b6..9178228066 100644
--- a/server/mail/dovecot.xml
+++ b/server/mail/dovecot.xml
@@ -7,9 +7,9 @@
   <!ENTITY dovecot-download-http
   "https://www.dovecot.org/releases/&dovecot-major;.&dovecot-minor;/dovecot-&dovecot-version;.tar.gz">
   <!ENTITY dovecot-download-ftp  " ">
-  <!ENTITY dovecot-md5sum        "b8add62d0311dcc95ac25b379e8ba043">
-  <!ENTITY dovecot-size          "7.4 MB">
-  <!ENTITY dovecot-buildsize     "235 MB">
+  <!ENTITY dovecot-md5sum        "8961c3dafd845a25fd55e7903ffc3755">
+  <!ENTITY dovecot-size          "7.5 MB">
+  <!ENTITY dovecot-buildsize     "237 MB">
   <!ENTITY dovecot-time          "4.8 SBU">
 ]>