diff --git a/CHANGES b/CHANGES
index 65c8b54a8a..9ae8a02231 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
+Changes with Apache 2.4.21
+
+
 Changes with Apache 2.4.20
 
   *) core: Do not read .htaccess if AllowOverride and AllowOverrideList
diff --git a/STATUS b/STATUS
index 3846da73c1..75b153b2ee 100644
--- a/STATUS
+++ b/STATUS
@@ -34,6 +34,7 @@ Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
 
+    2.4.21  : In development.
     2.4.20  : Tagged on April 4, 2016.
     2.4.19  : Tagged on March 21, 2016, not released.
     2.4.18  : Tagged on December 8, 2015. Released on December 14, 2015.
diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index e549cb7d4a..90f5fc49a6 100644
--- a/docs/manual/style/version.ent
+++ b/docs/manual/style/version.ent
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "4">
-<!ENTITY httpd.patch "20">
+<!ENTITY httpd.patch "21">
 
 <!ENTITY httpd.docs "2.4">
diff --git a/include/ap_release.h b/include/ap_release.h
index becf09cf70..6d5209ed78 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -43,8 +43,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 4
-#define AP_SERVER_PATCHLEVEL_NUMBER   20
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   21
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */