diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 78ca4b215..21aaecef7 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -237,13 +237,6 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_s_i (oConnectQuickTimeout, "connect-quick-timeout", "@"),
 
 
-  ARGPARSE_header ("Keyserver", N_("Configuration for Keyservers")),
-
-  ARGPARSE_s_s (oKeyServer, "keyserver",
-                N_("|URL|use keyserver at URL")),
-  ARGPARSE_s_s (oHkpCaCert, "hkp-cacert",
-                N_("|FILE|use the CA certificates in FILE for HKP over TLS")),
-
   ARGPARSE_header ("HTTP", N_("Configuration for HTTP servers")),
 
   ARGPARSE_s_n (oDisableHTTP, "disable-http", N_("inhibit the use of HTTP")),
@@ -255,8 +248,14 @@ static gpgrt_opt_t opts[] = {
                 N_("use system's HTTP proxy setting")),
   ARGPARSE_s_s (oLDAPWrapperProgram, "ldap-wrapper-program", "@"),
 
+  ARGPARSE_header ("Keyserver", N_("Configuration for OpenPGP servers")),
 
-  ARGPARSE_header ("LDAP", N_("Configuration of LDAP servers to use")),
+  ARGPARSE_s_s (oKeyServer, "keyserver",
+                N_("|URL|use keyserver at URL")),
+  ARGPARSE_s_s (oHkpCaCert, "hkp-cacert",
+                N_("|FILE|use the CA certificates in FILE for HKP over TLS")),
+
+  ARGPARSE_header ("LDAP", N_("Configuration for X.509 servers")),
 
   ARGPARSE_s_n (oDisableLDAP, "disable-ldap", N_("inhibit the use of LDAP")),
   ARGPARSE_s_n (oIgnoreLDAPDP,"ignore-ldap-dp",
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 60e3f741a..bc4bac62e 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -349,8 +349,7 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_s_s (oKeyring, "keyring",
                 N_("|FILE|add keyring to the list of keyrings")),
   ARGPARSE_s_n (oNoDefKeyring, "no-default-keyring", "@"),
-  ARGPARSE_s_s (oKeyServer, "ldapserver",
-                N_("|SPEC|use this keyserver to lookup keys")),
+  ARGPARSE_s_s (oKeyServer, "ldapserver", "@"),
   ARGPARSE_s_s (oKeyServer, "keyserver", "@"),
   ARGPARSE_s_n (oUseKeyboxd,    "use-keyboxd", "@"),
 
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index fa4ca015f..5a393732d 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -461,7 +461,7 @@ static known_option_t known_options_gpgsm[] =
    { "encrypt-to",        GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
    { "disable-dirmngr",   GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT },
    { "p12-charset",       GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
-   { "keyserver",         GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
+   { "ldapserver",        GC_OPT_FLAG_LIST, GC_LEVEL_INVISIBLE,
                           GC_ARG_TYPE_LDAP_SERVER },
    { "compliance",        GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT },
    { "debug-level",       GC_OPT_FLAG_ARG_OPT, GC_LEVEL_ADVANCED },
@@ -505,6 +505,8 @@ static known_option_t known_options_dirmngr[] =
    { "force",             GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
    { "use-tor",           GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
    { "keyserver",         GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
+   { "ldapserver",        GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
+                          GC_ARG_TYPE_LDAP_SERVER },
    { "disable-http",      GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
    { "ignore-http-dp",    GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
    { "http-proxy",        GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },