diff --git a/Makefile.in b/Makefile.in
index 115e1d8f9e..98d2aadd10 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -64,7 +64,7 @@ LEX = @LEX@
COMPILE_ET = @COMPILE_ET@
PACKAGE = cyrus-imapd
-VERSION = 2.4.21
+VERSION = 2.4.22
GIT_VERSION = $(VERSION).git$(shell date +'%Y%m%d%H%M')
all:: xversion
diff --git a/doc/changes.html b/doc/changes.html
index 6c271b7882..ddec2bb3c6 100644
--- a/doc/changes.html
+++ b/doc/changes.html
@@ -8,6 +8,13 @@
+Changes to the Cyrus IMAP Server since 2.4.21
+
+- Fixed issue #3312: fixed use-after-free segfault in imapd and
+mupdate-client (thanks Mario Haustein)
+- Fixed: XFER now recognises 3.4 and 3.5 backends
+
+
Changes to the Cyrus IMAP Server since 2.4.20
- Fixed issue #885: timsieved segfault (thanks Christian Henz)