diff --git a/Documentation/docinfo.xml b/Documentation/docinfo.xml
index 4e1a9ca9b..ed0782cd5 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.20 - March 2017</releaseinfo>
-<subtitle>for version 2.3.20</subtitle>
-<date>2017-03-10</date>
+<releaseinfo>Version 2.3.21 - June 2017</releaseinfo>
+<subtitle>for version 2.3.21</subtitle>
+<date>2017-06-01</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 6ab1ba613..b2ec05ad1 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.20
+:release_version: 2.3.21
 
 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab:
diff --git a/Version b/Version
index a1710db01..ed846fd41 100644
--- a/Version
+++ b/Version
@@ -4,4 +4,4 @@
 
 MAJOR_VERSION=2
 MINOR_VERSION=3
-SUBMINOR_VERSION=20
+SUBMINOR_VERSION=21