diff --git a/ChangeLog b/ChangeLog
index 591d59cb5..de25d365c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-04  Werner Koch  <wk@g10code.com>
+
+	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Add --enable-mailto
+
+	* configure.ac (AC_CONFIG_FILES): Rename gpgkeys_ to gpg2keys_.
+
 2007-03-08  Werner Koch  <wk@g10code.com>
 
 	Released 2.0.3.
diff --git a/Makefile.am b/Makefile.am
index c5dec1426..8d51a2e05 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
 AUTOMAKE_OPTIONS = dist-bzip2
-DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun
+DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto
 
 EXTRA_DIST = scripts/config.rpath autogen.sh README.SVN
 DISTCLEANFILES = g10defs.h 
diff --git a/configure.ac b/configure.ac
index c597d699a..0ae7f3f68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1321,8 +1321,8 @@ sm/Makefile
 agent/Makefile
 scd/Makefile
 keyserver/Makefile
-keyserver/gpgkeys_mailto
-keyserver/gpgkeys_test
+keyserver/gpg2keys_mailto
+keyserver/gpg2keys_test
 tools/gpg-zip
 tools/Makefile
 doc/Makefile
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 533c97fd3..ed3ff6052 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -268,7 +268,7 @@ debugging.
 @opindex c
 @opindex csh
 Format the info output in daemon mode for use with the standard Bourne
-shell respective the C-shell . The default ist to guess it based on the
+shell respective the C-shell . The default is to guess it based on the
 environment variable @code{SHELL} which is in almost all cases
 sufficient.
 
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 3e009430a..2120ee95c 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-04  Werner Koch  <wk@g10code.com>
+
+	* gpgkeys_test.in: Rename to ..
+	* gpg2keys_test.in: .. this.
+	* gpgkeys_mailto.in: Rename to ..
+	* gpg2keys_mailto.in: .. this
+	* Makefile.am: Likewise
+
 2007-03-13  David Shaw  <dshaw@jabberwocky.com>
 
 	From STABLE-BRANCH-1-4
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index 2e9add011..f6a287030 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -34,7 +34,7 @@ include $(top_srcdir)/am/cmacros.am
 libexec_PROGRAMS = $(GPGKEYS_LDAP) $(GPGKEYS_HKP) $(GPGKEYS_FINGER) \
                    $(GPGKEYS_CURL)
 libexec_SCRIPTS = $(GPGKEYS_MAILTO)
-noinst_SCRIPTS = gpgkeys_test
+noinst_SCRIPTS = gpg2keys_test
 
 common_libs = ../gl/libgnu.a  ../common/libcommon.a ../jnlib/libjnlib.a
 other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
diff --git a/keyserver/gpgkeys_mailto.in b/keyserver/gpg2keys_mailto.in
similarity index 97%
rename from keyserver/gpgkeys_mailto.in
rename to keyserver/gpg2keys_mailto.in
index e37f5c0bc..4d5f62711 100755
--- a/keyserver/gpgkeys_mailto.in
+++ b/keyserver/gpg2keys_mailto.in
@@ -1,6 +1,6 @@
 #!@PERL@ -w
 
-# gpgkeys_mailto - talk to a email keyserver 
+# gpg2keys_mailto - talk to a email keyserver 
 # Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
@@ -27,7 +27,7 @@ $sendmail="@SENDMAIL@ -t";
 
 sub VERSION_MESSAGE ()
 {
-    print STDOUT "gpgkeys_mailto (GnuPG) @VERSION@\n";
+    print STDOUT "gpg2keys_mailto (GnuPG) @VERSION@\n";
 }
 
 sub HELP_MESSAGE ()
diff --git a/keyserver/gpgkeys_test.in b/keyserver/gpg2keys_test.in
similarity index 95%
rename from keyserver/gpgkeys_test.in
rename to keyserver/gpg2keys_test.in
index 97748cd3f..c335c65a2 100755
--- a/keyserver/gpgkeys_test.in
+++ b/keyserver/gpg2keys_test.in
@@ -1,6 +1,6 @@
 #!@PERL@
 
-# gpgkeys_test - keyserver code tester
+# gpg2keys_test - keyserver code tester
 # Copyright (C) 2001 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
@@ -26,7 +26,7 @@ $|=1;
 
 sub VERSION_MESSAGE ()
 {
-    print STDOUT "gpgkeys_test (GnuPG) @VERSION@\n";
+    print STDOUT "gpg2keys_test (GnuPG) @VERSION@\n";
 }
 
 sub HELP_MESSAGE ()