diff --git a/dirmngr/ks-action.c b/dirmngr/ks-action.c
index 3651ca7db..0c547947f 100644
--- a/dirmngr/ks-action.c
+++ b/dirmngr/ks-action.c
@@ -357,9 +357,9 @@ ks_action_fetch (ctrl_t ctrl, const char *url, estream_t outfp)
 /* Send an OpenPGP key to all keyservers.  The key in {DATA,DATALEN}
    is expected to be in OpenPGP binary transport format.  The metadata
    in {INFO,INFOLEN} is in colon-separated format (concretely, it is
-   the output of 'for x in keys sigs; do gpg --list-$x --with-colons
-   KEYID; done'.  This function may modify DATA and INFO.  If this is
-   a problem, then the caller should create a copy.  */
+   the output of 'gpg --list-keys --with-colons KEYID').  This function
+   may modify DATA and INFO.  If this is a problem, then the caller
+   should create a copy.  */
 gpg_error_t
 ks_action_put (ctrl_t ctrl, uri_item_t keyservers,
 	       void *data, size_t datalen,
diff --git a/dirmngr/ks-engine-ldap.c b/dirmngr/ks-engine-ldap.c
index 11c922eac..7d61313d9 100644
--- a/dirmngr/ks-engine-ldap.c
+++ b/dirmngr/ks-engine-ldap.c
@@ -1737,9 +1737,6 @@ extract_attributes (LDAPMod ***modlist, char *line)
 
       if (is_sub)
 	modlist_add (modlist, "pgpSubKeyID", keyid);
-
-      if (is_sig)
-	modlist_add (modlist, "pgpSignerID", keyid);
     }
 
   if (is_pub)
@@ -1967,7 +1964,6 @@ ks_ldap_put (ctrl_t ctrl, parsed_uri_t uri,
   modlist_add (&modlist, "pgpKeyType", NULL);
   modlist_add (&modlist, "pgpUserID", NULL);
   modlist_add (&modlist, "pgpKeyCreateTime", NULL);
-  modlist_add (&modlist, "pgpSignerID", NULL);
   modlist_add (&modlist, "pgpRevoked", NULL);
   modlist_add (&modlist, "pgpSubKeyID", NULL);
   modlist_add (&modlist, "pgpKeySize", NULL);
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 66ef1c8c9..f6c2c45f1 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -2526,7 +2526,7 @@ static const char hlp_ks_put[] =
   "  INQUIRE KEYBLOCK_INFO\n"
   "\n"
   "The client shall respond with a colon delimited info lines (the output\n"
-  "of 'for x in keys sigs; do gpg --list-$x --with-colons KEYID; done').\n";
+  "of 'gpg --list-keys --with-colons KEYID').\n";
 static gpg_error_t
 cmd_ks_put (assuan_context_t ctx, char *line)
 {
@@ -2559,8 +2559,7 @@ cmd_ks_put (assuan_context_t ctx, char *line)
       goto leave;
     }
 
-  /* Ask for the key meta data. Not actually needed for HKP servers
-     but we do it anyway to test the client implementation.  */
+  /* Ask for the key meta data.  */
   err = assuan_inquire (ctx, "KEYBLOCK_INFO",
                         &info, &infolen, MAX_KEYBLOCK_LENGTH);
   if (err)
diff --git a/g10/call-dirmngr.c b/g10/call-dirmngr.c
index 1282ae192..1a4d896c6 100644
--- a/g10/call-dirmngr.c
+++ b/g10/call-dirmngr.c
@@ -1015,21 +1015,6 @@ ks_put_inq_cb (void *opaque, const char *line)
               }
               break;
 
-              /* This bit is really for the benefit of people who
-                 store their keys in LDAP servers.  It makes it easy
-                 to do queries for things like "all keys signed by
-                 Isabella".  */
-            case PKT_SIGNATURE:
-              {
-                PKT_signature *sig = node->pkt->pkt.signature;
-
-                if (IS_UID_SIG (sig))
-		  record_output (fp, node->pkt->pkttype, NULL,
-				 -1, -1, sig->keyid,
-				 sig->timestamp, sig->expiredate, NULL);
-              }
-              break;
-
             default:
               continue;
             }