diff --git a/debian.changelog b/debian.changelog
index 088b855..44e1691 100644
--- a/debian.changelog
+++ b/debian.changelog
@@ -1,4 +1,4 @@
-gromox (2.20) unstable; urgency=low
+gromox (2.21) unstable; urgency=low
 
   * Initial package.
 
diff --git a/gromox-2.20.tar.asc b/gromox-2.20.tar.asc
deleted file mode 100644
index d06b1a0..0000000
--- a/gromox-2.20.tar.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iHUEABYKAB0WIQS8oMXDCcrFaedKkhz3bv5dDCI6jwUCZXwyyQAKCRD3bv5dDCI6
-j6clAP9QsP2G1AJh7MLSTxLAzimblWetkIyaMVHvd6kW5STbzAEAzkfVx3CaDAiv
-WhlZDUQWKrEUmV3PJjzUL/vskLAiygs=
-=p7qe
------END PGP SIGNATURE-----
diff --git a/gromox-2.20.tar.zst b/gromox-2.20.tar.zst
deleted file mode 100644
index 11c5492..0000000
--- a/gromox-2.20.tar.zst
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:556d095cf172cd376cd345fc4874fa3459858502ac9fc7915786223539565118
-size 2093367
diff --git a/gromox-2.21.tar.asc b/gromox-2.21.tar.asc
new file mode 100644
index 0000000..d5bc7ed
--- /dev/null
+++ b/gromox-2.21.tar.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+
+iHUEABYKAB0WIQS8oMXDCcrFaedKkhz3bv5dDCI6jwUCZZwjuAAKCRD3bv5dDCI6
+j9IIAQDn/VzQvqgSLS2xBDUVoEP02Poh7HgNvPAXVqoQa5FmuAEA2ZZyjo6u6oDa
++uZnhPnMDu4cGQSe/dkEb4tF/Qs4jws=
+=+7J0
+-----END PGP SIGNATURE-----
diff --git a/gromox-2.21.tar.zst b/gromox-2.21.tar.zst
new file mode 100644
index 0000000..b64ca93
--- /dev/null
+++ b/gromox-2.21.tar.zst
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7b217535a48020a78001e4958af60cc0606fc496e945df1ae873691ee99388d
+size 2067713
diff --git a/gromox.changes b/gromox.changes
index 1666dc3..9a5675d 100644
--- a/gromox.changes
+++ b/gromox.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Jan  8 14:05:14 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 2.21
+  * Support for outgoing message submission via postdrop
+  * gromox-snapshot: Support snapshots on XFS
+  * zcore: log REMOTE_ADDR on authentication failure for fail2ban
+  * exmdb: add ICS request dumper
+  * lib: guard against an integer overflow when inserting last
+    element in range_set
+  * imap: do not flag zero-length usernames/passwords as a syntax
+    error
+
 -------------------------------------------------------------------
 Fri Dec 15 10:00:02 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/gromox.dsc b/gromox.dsc
index b639f1f..4c90150 100644
--- a/gromox.dsc
+++ b/gromox.dsc
@@ -1,7 +1,7 @@
 Format: 1.0
 Source: gromox
 Architecture: any
-Version: 2.20
+Version: 2.21
 DEBTRANSFORM-RELEASE: 1
 Maintainer: Gromox <null@gromox.com>
 Homepage: https://gromox.com
diff --git a/gromox.spec b/gromox.spec
index 31b1ba4..db434d0 100644
--- a/gromox.spec
+++ b/gromox.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gromox
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %define _libexecdir %_prefix/libexec
 
 Name:           gromox
-Version:        2.20
+Version:        2.21
 Release:        0
 Summary:        Groupware server backend with RPC, IMAP,POP3, PHP-MAPI support
 License:        AGPL-3.0-or-later AND GPL-2.0-only AND GPL-3.0-or-later
@@ -35,7 +35,7 @@ BuildRequires:  libmysqlclient-devel >= 5.6
 BuildRequires:  openldap2-devel
 %else
 BuildRequires:  mariadb-devel >= 5.6
-BuildRequiers:  openldap-devel
+BuildRequires:  openldap-devel
 %endif
 BuildRequires:  make
 BuildRequires:  pam-devel
@@ -97,7 +97,6 @@ Requires(pre):  user(grommunio)
 Requires(pre):  user(gromox)
 Requires(pre):  group(gromox)
 Provides:       php-mapi-gromox = %version-%release
-Provides:       bundled(tzcode) = 2022c
 Conflicts:      grommunio-admin-api < 1.10.7
 %{?systemd_ordering}
 %if !0%{?_pamdir:1}
@@ -168,9 +167,9 @@ perl -i -lpe 's{Type=simple}{Type=simple\nRestart=on-failure}' "$b/%_unitdir"/*.
 
 %global services gromox-delivery.service gromox-delivery-queue.service gromox-event.service gromox-http.service gromox-imap.service gromox-midb.service gromox-pop3.service gromox-snapshot.service gromox-snapshot.timer gromox-timer.service gromox-zcore.service
 
+%if 0%{?service_add_pre:1}
 %pre
 # User addition done a priori by system-user-gromox(!)
-%if 0%{?service_add_pre:1}
 %service_add_pre %services
 %endif