diff --git a/Documentation/docinfo.xml b/Documentation/docinfo.xml
index ed0782cd5..04a0ace58 100644
--- a/Documentation/docinfo.xml
+++ b/Documentation/docinfo.xml
@@ -1,7 +1,7 @@
 <!-- TODO have the build system take care of this  -->
-<releaseinfo>Version 2.3.21 - June 2017</releaseinfo>
-<subtitle>for version 2.3.21</subtitle>
-<date>2017-06-01</date>
+<releaseinfo>Version 2.3.22 - July 2017</releaseinfo>
+<subtitle>for version 2.3.22</subtitle>
+<date>2017-07-20</date>
 
 <legalnotice>
   <para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".</para>
diff --git a/Documentation/includes/global-attributes.asciidoc b/Documentation/includes/global-attributes.asciidoc
index b2ec05ad1..5b9e59bd0 100644
--- a/Documentation/includes/global-attributes.asciidoc
+++ b/Documentation/includes/global-attributes.asciidoc
@@ -13,6 +13,6 @@
 
 // TODO have the build system take care of this
 
-:release_version: 2.3.21
+:release_version: 2.3.22
 
 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab:
diff --git a/NEWS b/NEWS
index 5abe82a84..998868461 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,12 @@
-2.3.22 (2017-XX-XX)
+2.3.22 (2017-07-20)
 -------------------
 
 New features
  - [eas] initial EAS v16 and email drafts support
 
+Enhancements
+ - [web] updated CKEditor to version 4.7.1
+
 Bug fixes
  - [web] use the organizer's alarm by default when accepting IMIP messages (#3934)
  - [web] fixed forwarding mails with attachments containing slashes in file names
diff --git a/Version b/Version
index ed846fd41..811fde9c4 100644
--- a/Version
+++ b/Version
@@ -4,4 +4,4 @@
 
 MAJOR_VERSION=2
 MINOR_VERSION=3
-SUBMINOR_VERSION=21
+SUBMINOR_VERSION=22