diff --git a/tools/ChangeLog b/tools/ChangeLog
index da435bb8c..6e8d92354 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,5 +1,8 @@
 2008-08-06  Marcus Brinkmann  <marcus@g10code.de>
 
+	* gpgconf-comp.c (gc_options_gpgsm): Change type of keyserver
+	option to GC_ARG_TYPE_LDAP_SERVER.
+
 	* gpgconf-comp.c (retrieve_options_from_file): Transfer the
 	NO_CHANGE flag from the file name option to the list option.
 
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 25d441508..f7c8af1d7 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -742,7 +742,7 @@ static gc_option_t gc_options_gpgsm[] =
      GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
    { "keyserver", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
      "gnupg", N_("|SPEC|use this keyserver to lookup keys"),
-     GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
+     GC_ARG_TYPE_LDAP_SERVER, GC_BACKEND_GPGSM },
 
    { "Debug",
      GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,