diff --git a/NEWS b/NEWS
index ab81e316d..3c2b89943 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,11 @@
+Noteworthy changes in version 2.1.21 (unreleased)
+-------------------------------------------------
+
+
 Noteworthy changes in version 2.1.20 (2017-04-03)
 -------------------------------------------------
 
-  * gpg: New properties 'expired', 'revoked', and 'disbaled' for the
+  * gpg: New properties 'expired', 'revoked', and 'disabled' for the
     import and export filters.
 
   * gpg: New command --quick-set-primary-uid.
diff --git a/configure.ac b/configure.ac
index df7a059e5..f58708c3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # configure.ac - for GnuPG 2.1
-# Copyright (C) 1998-2012 Free Software Foundation, Inc.
-# Copyright (C) 1998-2016 Werner Koch
+# Copyright (C) 1998-2017 Free Software Foundation, Inc.
+# Copyright (C) 1998-2017 Werner Koch
 #
 # This file is part of GnuPG.
 #
@@ -28,7 +28,7 @@ min_automake_version="1.14"
 m4_define([mym4_package],[gnupg])
 m4_define([mym4_major], [2])
 m4_define([mym4_minor], [1])
-m4_define([mym4_micro], [20])
+m4_define([mym4_micro], [21])
 
 # To start a new development series, i.e a new major or minor number
 # you need to mark an arbitrary commit before the first beta release