diff --git a/NEWS b/NEWS
index 4364405b1..7d7740646 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 2.1.0beta3
+Noteworthy changes in version 2.1.0beta3 (2011-12-20)
 -----------------------------------------------------
 
  * Fixed regression in GPG's secret key export function.
@@ -15,7 +15,7 @@ Noteworthy changes in version 2.1.0beta3
  * gpg-connect-agent does now proberly display the help output for
    "SCD HELP" commands.
 
- * New GPGSM validation model "steed".
+ * Preliminary support for the GPGSM validation model "steed".
 
  * Improved certificate creation in GPGSM.
 
diff --git a/README.maint b/README.maint
index f390afc97..bdcdbf9c0 100644
--- a/README.maint
+++ b/README.maint
@@ -27,8 +27,8 @@ Release process:
   * Run "make -C po update-po".
   * Write NEWS entries and set the release date in NEWS.
   * In configure.ac set "my_issvn" to "no".
-  * Put a "Release <version>" line into the top level ChangeLog.
   * Commit all changes to GIT and push them.
+  * Do a commit with a "Release <version>" line.
   * Run "./autogen.sh --force"
     (--force is required for the svn magic in configure.ac and a good
     idea in any case)
diff --git a/configure.ac b/configure.ac
index 9dd555ea7..b3c767878 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,8 +24,8 @@ min_automake_version="1.10"
 # Remember to change the version number immediately *after* a release.
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [2.1.0])
-m4_define([my_issvn], [yes])
+m4_define([my_version], [2.1.0beta3])
+m4_define([my_issvn], [no])
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
diff --git a/doc/HACKING b/doc/HACKING
index d6cb8ab4c..0ef5b891d 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -23,7 +23,8 @@ and ChangeLog entries don't give enough of the big picture.  Omit the
 leading TABs that you're used to seeing in a "real" ChangeLog file, but
 keep the maximum line length at 72 or smaller, so that the generated
 ChangeLog lines, each with its leading TAB, will not exceed 80 columns.
-
+If you want to add text which shall not be copied to the ChangeLog,
+separate it by a line consisting of two dashes at the begin of a line.
 
 
 ===> What follows is probably out of date <===
@@ -39,15 +40,17 @@ RFCs
 
 1750  Randomness Recommendations for Security.
 
-1991  PGP Message Exchange Formats.
-
-2015  MIME Security with Pretty Good Privacy (PGP).
+1991  PGP Message Exchange Formats (obsolete)
 
 2144  The CAST-128 Encryption Algorithm.
 
 2279  UTF-8, a transformation format of ISO 10646.
 
-2440  OpenPGP.
+2440  OpenPGP (obsolete).
+
+3156  MIME Security with Pretty Good Privacy (PGP).
+
+4880  Current OpenPGP specification.