diff --git a/g10/ChangeLog b/g10/ChangeLog
index 4af244c7a..899ab8d12 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-24  David Shaw  <dshaw@jabberwocky.com>
+
+	* keyserver.c (parse_keyserver_uri): If there is a path present,
+	set the direct_uri flag so the right keyserver helper is run.
+
 2006-01-22  David Shaw  <dshaw@jabberwocky.com>
 
 	* keyserver.c (keyserver_spawn): Include the EXEEXT so we can find
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 75f45b654..6c5514487 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -362,6 +362,9 @@ parse_keyserver_uri(const char *uri,int require_scheme,
 	keyserver->path=xstrdup(uri);
       else
 	keyserver->path=xstrdup("/");
+
+      if(keyserver->path[1]!='\0')
+	keyserver->flags.direct_uri=1;
     }
   else if(uri[0]!='/')
     {