diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 696b7437f..24871bb57 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,6 +1,12 @@
+2002-04-29  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpgkeys_mailto.in: Properly handle key requests in full
+	fingerprint form.
+
 2002-03-29  David Shaw  <dshaw@jabberwocky.com>
 
-	* gpgkeys_ldap.c (printquoted): Quote backslashes
+	* gpgkeys_ldap.c (printquoted): Quote backslashes within keyserver
+	search responses.
 
 2002-02-25  David Shaw  <dshaw@jabberwocky.com>
 
diff --git a/keyserver/gpgkeys_mailto.in b/keyserver/gpgkeys_mailto.in
index d978a6797..c31048360 100755
--- a/keyserver/gpgkeys_mailto.in
+++ b/keyserver/gpgkeys_mailto.in
@@ -1,7 +1,7 @@
 #!@PERL@ -w
 
 # gpgkeys_mailto - talk to a email keyserver
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
@@ -104,7 +104,7 @@ if($command=~/get/i || $command=~/search/i)
 
 	    if(length($key)>8)
 	    {
-		$key=substr($key,8);
+		$key=substr($key,-8);
 	    }
 
     	    print MAIL "Subject: GET 0x$key\n\n";