diff --git a/configure.ac b/configure.ac
index fa66e6065..ec5361c55 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.0.10rc1])
-m4_define([my_issvn], [no])
+m4_define([my_version], [2.0.10])
+m4_define([my_issvn], [yes])
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
 AC_INIT([gnupg], 
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 22d239715..979a681be 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-09  Werner Koch  <wk@g10code.com>
+
+	* gpg.c (main) [IS_DEVELOPMENT_VERSION]: Fix strusage use.
+
 2008-12-09  Werner Koch  <wk@g10code.com>
 
 	* keygen.c (proc_parameter_file): Check that key and subkey usages
diff --git a/g10/gpg.c b/g10/gpg.c
index 9af97fb16..4e72b87e6 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2936,15 +2936,15 @@ main (int argc, char **argv)
 	fprintf(stderr, "%s\n", strusage(15) );
     }
 #ifdef IS_DEVELOPMENT_VERSION
-    if( !opt.batch )
+    if (!opt.batch)
       {
 	const char *s;
 
-	if((s=strusage(20)))
+	if((s=strusage(25)))
 	  log_info("%s\n",s);
-	if((s=strusage(21)))
+	if((s=strusage(26)))
 	  log_info("%s\n",s);
-	if((s=strusage(22)))
+	if((s=strusage(27)))
 	  log_info("%s\n",s);
       }
 #endif