diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 8bc5deb3b..caf381c85 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-29  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpgkeys_mailto.in: Fix regexp to work properly if the "keyid" is
+	not a keyid, but rather a text string from the user ID.
+
 2003-01-06  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpgkeys_hkp.c (get_key): Use options=mr when getting a key so
diff --git a/keyserver/gpgkeys_mailto.in b/keyserver/gpgkeys_mailto.in
index 9086de419..4e48ba479 100755
--- a/keyserver/gpgkeys_mailto.in
+++ b/keyserver/gpgkeys_mailto.in
@@ -44,7 +44,7 @@ while(<STDIN>)
 {
     last if($_ eq "\n");
 
-    if(/^COMMAND (\w+)/)
+    if(/^COMMAND (\S+)/)
     {
 	$command=$1;
     }
@@ -59,7 +59,7 @@ while(<STDIN>)
 	$program=$1;
     }
 
-    if(/^OPTION (\w+)/)
+    if(/^OPTION (\S+)/)
     {
 	if($1=~/^verbose$/i)
 	{
@@ -175,7 +175,7 @@ if($command=~/send/i)
 
 	while(<STDIN>)
 	{
-	    if(/^KEY (\w+) BEGIN$/)
+	    if(/^KEY (\S+) BEGIN$/)
 	    {
 		$key=$1;
 		last;
@@ -184,7 +184,7 @@ if($command=~/send/i)
 
 	while(<STDIN>)
 	{
-	    if(/^KEY \w+ END$/)
+	    if(/^KEY \S+ END$/)
 	    {
 		last;
 	    }