28 files changed, 57 insertions, 155 deletions
diff --git a/.gitignore b/.gitignore
index aeab4a372..e6f4ed2f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,7 +44,6 @@ docbook-text-style.xsl
 **/cmdline/apt-extracttemplates
 **/cmdline/apt-get
 **/cmdline/apt-helper
-**/cmdline/apt-key
 **/cmdline/apt-mark
 **/cmdline/apt-sortpkgs
 **/cmdline/planners
diff --git a/README.md b/README.md
index b2a0fdb2b..58c349713 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,6 @@ Included tools are:
   as well as available packages
 * **apt-cdrom** to use removable media as a source for packages
 * **apt-config** as an interface to the configuration settings
-* **apt-key** as an interface to manage authentication keys
 * **apt-extracttemplates** to be used by debconf to prompt for configuration
   questions before installation
 * **apt-ftparchive** creates Packages and other index files
diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc
index 59301fa0c..237ddc856 100644
--- a/apt-pkg/contrib/gpgv.cc
+++ b/apt-pkg/contrib/gpgv.cc
@@ -111,8 +111,6 @@ static bool operator!=(LineBuffer const &buf, std::string_view const exp) noexce
    clear-signed files (=the complete content of the file is signed and
    the content isn't encoded) we do a divide and conquer approach here
    and split up the clear-signed file in message and signature for gpg.
-   And as a cherry on the cake, we use our apt-key wrapper to do part
-   of the lifting in regards to merging keyrings. Fun for the whole family.
 */
 #define apt_error(...) apt_msg("ERROR", __VA_ARGS__)
 #define apt_warning(...) apt_msg("WARNING", __VA_ARGS__)
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 191be05d6..c53b00881 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -75,7 +75,7 @@ static std::string NormalizeSignedBy(std::string SignedBy, bool const Introducer
       return os.str();
    }
 
-   // we could go all fancy and allow short/long/string matches as gpgv/apt-key does,
+   // we could go all fancy and allow short/long/string matches as gpgv does,
    // but fingerprints are harder to fake than the others and this option is set once,
    // not interactively all the time so easy to type is not really a concern.
    std::transform(SignedBy.begin(), SignedBy.end(), SignedBy.begin(), [](char const c) {
diff --git a/debian/control b/debian/control
index 1022efa37..a51da4456 100644
--- a/debian/control
+++ b/debian/control
@@ -69,7 +69,6 @@ Description: commandline package manager
     as well as installable packages
   * apt-cdrom to use removable media as a source for packages
   * apt-config as an interface to the configuration settings
-  * apt-key as an interface to manage authentication keys
 
 Package: libapt-pkg6.0t64
 Replaces: libapt-pkg6.0
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 67977ccc8..61db5888b 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -69,12 +69,6 @@
   </citerefentry>"
 >
 
-<!ENTITY apt-key "<citerefentry>
-    <refentrytitle><command>apt-key</command></refentrytitle>
-    <manvolnum>8</manvolnum>
-  </citerefentry>"
->
-
 <!ENTITY apt-secure "<citerefentry>
     <refentrytitle>apt-secure</refentrytitle>
     <manvolnum>8</manvolnum>
@@ -424,23 +418,6 @@
 		&synopsis-help;
 	</group>
 </cmdsynopsis></refsynopsisdiv>">
-<!ENTITY synopsis-param-keyid "<replaceable>&synopsis-keyid;</replaceable>">
-<!ENTITY synopsis-command-apt-key "<refsynopsisdiv><cmdsynopsis>
-	<command>apt-key</command>
-	<arg><option>--keyring &synopsis-param-filename;</option></arg>
-	<group choice='req'>
-		<arg choice='plain'>add &synopsis-param-filename;</arg>
-		<arg choice='plain'>del &synopsis-param-keyid;</arg>
-		<arg choice='plain'>export &synopsis-param-keyid;</arg>
-		<arg choice='plain'>exportall</arg>
-		<arg choice='plain'>list</arg>
-		<arg choice='plain'>finger</arg>
-		<arg choice='plain'>adv</arg>
-		<arg choice='plain'>update</arg>
-		<arg choice='plain'>net-update</arg>
-		&synopsis-help;
-	</group>
-</cmdsynopsis></refsynopsisdiv>">
 <!ENTITY synopsis-command-apt-mark "<refsynopsisdiv><cmdsynopsis>
 	<command>apt-mark</command>
 	<group choice='plain'>
diff --git a/doc/apt.ent b/doc/apt.ent
index b502073a9..9034d2e66 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -258,7 +258,3 @@ or further configured by the <option>APT::Color</option> configuration option an
 
 <!-- TRANSLATOR: used as parameter for apt-ftparchive  e.g. apt-ftparchive generate section -->
 <!ENTITY synopsis-section "section">
-
-<!-- TRANSLATOR: used as in apt-key export keyid  e.g. apt-key export 473041FA -->
-<!ENTITY synopsis-keyid "keyid">
-
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index dfed6c4d5..bb7a2180e 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -525,13 +525,6 @@ msgid ""
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
diff --git a/doc/po/de.po b/doc/po/de.po
index 71b7ead94..7268e5d8c 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -697,13 +697,6 @@ msgid ""
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr "<!ENTITY synopsis-section \"Abschnitt\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr "<!ENTITY synopsis-keyid \"Schlüsselkennung\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -14080,6 +14073,11 @@ msgstr ""
 "fortfahren, wodurch die bereits auf der Platte heruntergeladenen Archive "
 "benutzt werden."
 
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr "<!ENTITY synopsis-keyid \"Schlüsselkennung\">"
+
 #, fuzzy
 #~| msgid "APT key management utility"
 #~ msgid "Deprecated APT key management utility"
diff --git a/doc/po/es.po b/doc/po/es.po
index 0eb8a0cbe..bf6f153f3 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -777,15 +777,6 @@ msgstr ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
diff --git a/doc/po/fr.po b/doc/po/fr.po
index b020c08be..df70ce2b8 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -692,13 +692,6 @@ msgid ""
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr "<!ENTITY synopsis-section \"section\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr "<!ENTITY synopsis-keyid \"id_de_clé\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -13911,6 +13904,11 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr "<!ENTITY synopsis-keyid \"id_de_clé\">"
+
 #, fuzzy
 #~| msgid "APT key management utility"
 #~ msgid "Deprecated APT key management utility"
diff --git a/doc/po/it.po b/doc/po/it.po
index 75751dadb..5fa78e1e8 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -736,15 +736,6 @@ msgstr ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"sezione\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"IDchiave\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -13695,6 +13686,13 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"IDchiave\">"
+
 #, fuzzy
 #~| msgid "APT key management utility"
 #~ msgid "Deprecated APT key management utility"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index e223cbd6e..783e29c32 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -739,15 +739,6 @@ msgstr ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"セクション\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"キーID\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -13143,6 +13134,13 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
 
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"キーID\">"
+
 #, fuzzy
 #~| msgid "APT key management utility"
 #~ msgid "Deprecated APT key management utility"
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 56b8207f2..e265e318a 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -705,15 +705,6 @@ msgstr ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"sectie\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"sleutel-ID\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -14249,6 +14240,13 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 "En dit zal gebruik maken van de reeds opgehaalde archieven op de schijf."
 
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"sleutel-ID\">"
+
 #~ msgid "Deprecated APT key management utility"
 #~ msgstr "Verouderd hulpprogramma voor het beheer van de sleutels van APT"
 
diff --git a/doc/po/pl.po b/doc/po/pl.po
index db3391fd6..c8c38c448 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -735,15 +735,6 @@ msgstr ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"sekcja\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"id_klucza\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -12517,6 +12508,13 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"id_klucza\">"
+
 #
 #, fuzzy
 #~| msgid "APT key management utility"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 0a5832611..083a16f37 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -700,15 +700,6 @@ msgstr ""
 "<!-- TRANSLATOR: usado como parâmetro para apt-ftparchive ex. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"secção\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: usado como id de chave de exportação do apt-key ex. apt-key "
-"export 473041FA --> <!ENTITY synopsis-keyid \"id_de_chave\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -13868,6 +13859,13 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr ""
+#~ "<!-- TRANSLATOR: usado como id de chave de exportação do apt-key ex. apt-"
+#~ "key export 473041FA --> <!ENTITY synopsis-keyid \"id_de_chave\">"
+
 #~ msgid "Deprecated APT key management utility"
 #~ msgstr "Utilitário de gestão de chaves do APT descontinuado"
 
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index f36008f8c..f685f4026 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -501,13 +501,6 @@ msgid ""
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 8eda8d67f..1a6356dee 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -211,7 +211,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
 
    FILE *pipein = fdopen(fd[0], "r");
 
-   // Loop over the output of apt-key (which really is gnupg), and check the signatures.
+   // Loop over the output of gpgv, and check the signatures.
    std::vector<std::string> ErrSigners;
    std::map<std::string, std::vector<std::string>> SubKeyMapping;
    size_t buffersize = 0;
@@ -337,7 +337,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
    for (auto errSigner : ErrSigners)
       Signers.Worthless.push_back({errSigner, ""});
 
-   // apt-key has a --keyid parameter, but this requires gpg, so we call it without it
+   // gpgv has no --keyid parameter, so we call it without it
    // and instead check after the fact which keyids where used for verification
    if (keyFpts.empty() == false)
    {
@@ -562,7 +562,7 @@ bool GPGVMethod::URIAcquire(std::string const &Message, FetchItem *Itm)
 	    keyFpts.emplace_back(std::move(key));
    }
 
-   // Run apt-key on file, extract contents and get the key ID of the signer
+   // Run gpgv on file, extract contents and get the key ID of the signer
    string const msg = VerifyGetSignersWithLegacy(Path.c_str(), Itm->DestFile.c_str(), keyFpts, keyFiles, Signers);
    if (_error->PendingError())
       return false;
@@ -657,7 +657,7 @@ bool GPGVMethod::URIAcquire(std::string const &Message, FetchItem *Itm)
    Dequeue();
 
    if (DebugEnabled())
-      std::clog << "apt-key succeeded\n";
+      std::clog << "gpgv succeeded\n";
 
    return true;
 }
diff --git a/methods/sqv.cc b/methods/sqv.cc
index 45d001af1..ce7e36657 100644
--- a/methods/sqv.cc
+++ b/methods/sqv.cc
@@ -296,7 +296,7 @@ bool SQVMethod::URIAcquire(std::string const &Message, FetchItem *Itm)
    if (_error->PendingError())
       return false;
 
-   // Run apt-key on file, extract contents and get the key ID of the signer
+   // Run sqv on file, extract contents and get the key ID of the signer
    VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(), keyFiles, Signers);
    if (_error->PendingError())
    {
diff --git a/prepare-release b/prepare-release
index fe9628fd0..c5d6ac81b 100755
--- a/prepare-release
+++ b/prepare-release
@@ -233,7 +233,6 @@ elif [ "$1" = 'spellcheckers' -o "$1" = 'lint' ]; then
 				-e '^.*apt-pkg/pkgcache\.h.*mmaped.*==>.*mapped.*$' \
 				-e '^.*apt-pkg/pkgcachegen\.cc.*mmaped.*==>.*mapped.*$' \
 				-e '^.*apt-pkg/contrib/mmap\.h.*mmaped.*==>.*mapped.*$' \
-				-e '^.*cmdline/apt-key\.in.*dashs.*==>.*dashes.*$' \
 				-e '^.*methods/aptmethod\.h.*creat.*==>.*create.*$' \
 				-e '^.*dselect/install.*ans.*==>.*and.*$' \
 				-e '^.*ftparchive/writer\.h.*Delink.*==>.*Unlink.*$' \
@@ -276,9 +275,6 @@ elif [ "$1" = 'spellcheckers' -o "$1" = 'lint' ]; then
 				-e '^./ftparchive/byhash.cc: ByHash ByHash (duplicate word) -> ByHash$' \
 				-e '^./ftparchive/writer.cc: this Packages -> these packages$' \
 				-e '^./ftparchive/byhash.h: ByHash ByHash (duplicate word) -> ByHash$' \
-				-e '^./cmdline/apt-key.in: done done (duplicate word) -> done$' \
-				-e '^./cmdline/apt-key.in: fi fi (duplicate word) -> fi$' \
-				-e '^./cmdline/apt-key.in: echo echo (duplicate word) -> echo$' \
 				-e '^./triehash/.travis.yml: perl perl (duplicate word) -> perl$' \
 				-e '^./triehash/README.md: Performance Performance (duplicate word) -> Performance$' \
 				-e '^./debian/apt.apt-compat.cron.daily: fi fi (duplicate word) -> fi$' \
diff --git a/vendor/README b/vendor/README
index 6846c8455..3b344d5ad 100644
--- a/vendor/README
+++ b/vendor/README
@@ -2,10 +2,10 @@ The vendor system in APT is an experiment to help distributions ship a stock
 apt release instead of applying documentation patches to it, increasing
 maintenance burden for everyone and hiding 'interesting' patches in the mix.
 
-The provided information is used in the apt-key script and in documentation
-like manpages and example configuration files. If you have patches modifying
-additional bits and pieces currently not covered by this system please
-contact us so we can change this!
+The provided information is used in documentation like man pages and
+example configuration files. If you have patches modifying additional
+bits and pieces currently not covered by this system please contact us
+so we can change this!
 
 
 == Adding a new vendor
@@ -39,8 +39,7 @@ by opening a bug in the Debian BTS against apt with a patch attached.
 The format used is the one DocBook XML uses. The file is included as an
 entity file in the manpages xml source, so the syntax has to be valid!
 
-The keyring-* settings are additionally used also in the creation of the
-apt-key script and the keyring-package in particular as a dependency for apt.
+The keyring-package setting is used as a dependency for apt.
 
 The field current-codename is optional and can be used in sources.list.in.
 
diff --git a/vendor/blankon/apt-vendor.ent b/vendor/blankon/apt-vendor.ent
index ea7625f90..a2d0d640b 100644
--- a/vendor/blankon/apt-vendor.ent
+++ b/vendor/blankon/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "BlankOn">
 <!ENTITY keyring-package "<package>blankon-keyring</package>">
-<!ENTITY keyring-filename "<filename>/usr/share/keyrings/blankon-archive-keyring.gpg</filename>">
-<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/blankon-archive-removed-keys.gpg</filename>">
-<!ENTITY keyring-master-filename "/usr/share/keyrings/blankon-master-keyring.gpg">
-<!ENTITY keyring-uri "http://arsip.blankonlinux.or.id/blankon/project/blankon-archive-keyring.gpg">
 <!ENTITY current-codename "tambora">
 
 <!ENTITY sourceslist-list-format "deb http://arsip.blankonlinux.or.id/blankon &current-codename; main restricted
diff --git a/vendor/debian/apt-vendor.ent b/vendor/debian/apt-vendor.ent
index 4d02343b2..864f5a8df 100644
--- a/vendor/debian/apt-vendor.ent
+++ b/vendor/debian/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "Debian">
 <!ENTITY keyring-package "<package>debian-archive-keyring</package>">
-<!ENTITY keyring-filename "">
-<!ENTITY keyring-removed-filename "">
-<!ENTITY keyring-master-filename "">
-<!ENTITY keyring-uri "">
 
 <!ENTITY sourceslist-list-format "deb http://deb.debian.org/debian &debian-stable-codename; main contrib non-free non-free-firmware
 deb http://deb.debian.org/debian &debian-stable-codename;-updates main contrib non-free non-free-firmware
diff --git a/vendor/getinfo b/vendor/getinfo
index 2ef257c90..0a2dcf333 100755
--- a/vendor/getinfo
+++ b/vendor/getinfo
@@ -64,7 +64,7 @@ case "$1" in
 debian-stable-codename|debian-oldstable-codename|debian-testing-codename|ubuntu-codename)
 	getrawfield "$1" "$VERBATIM"
 	;;
-sourceslist-list-format|keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri|current-codename)
+sourceslist-list-format|keyring-package|current-codename)
 	exec $0 --vendor $CURRENT_VENDOR 'vendor' "$@"
 	;;
 vendor)
diff --git a/vendor/procursus/apt-vendor.ent b/vendor/procursus/apt-vendor.ent
index 0dd1d7a95..32d9fefee 100644
--- a/vendor/procursus/apt-vendor.ent
+++ b/vendor/procursus/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "Procursus">
 <!ENTITY keyring-package "<package>procursus-keyring</package>">
-<!ENTITY keyring-filename "">
-<!ENTITY keyring-removed-filename "">
-<!ENTITY keyring-master-filename "">
-<!ENTITY keyring-uri "">
 <!ENTITY current-codename "big_sur">
 
 <!ENTITY sourceslist-list-format "deb https://apt.procurs.us/ &current-codename; main">
diff --git a/vendor/raspbian/apt-vendor.ent b/vendor/raspbian/apt-vendor.ent
index 96d9fb71b..e3b960381 100644
--- a/vendor/raspbian/apt-vendor.ent
+++ b/vendor/raspbian/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "Raspbian">
 <!ENTITY keyring-package "<package>raspbian-archive-keyring</package>">
-<!ENTITY keyring-filename "<filename>/usr/share/keyrings/raspbian-archive-keyring.gpg</filename>">
-<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/raspbian-archive-removed-keys.gpg</filename>">
-<!ENTITY keyring-master-filename "">
-<!ENTITY keyring-uri "">
 
 <!ENTITY sourceslist-list-format "deb http://mirrordirector.raspbian.org/raspbian &debian-stable-codename; main contrib non-free">
 <!ENTITY sourceslist-sources-format "Types: deb
diff --git a/vendor/steamos/apt-vendor.ent b/vendor/steamos/apt-vendor.ent
index 7cf100fc4..2752999f9 100644
--- a/vendor/steamos/apt-vendor.ent
+++ b/vendor/steamos/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "SteamOS">
 <!ENTITY keyring-package "<package>valve-archive-keyring</package>">
-<!ENTITY keyring-filename "<filename>/usr/share/keyrings/valve-archive-keyring.gpg</filename>">
-<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/valve-archive-removed-keys.gpg</filename>">
-<!ENTITY keyring-master-filename "">
-<!ENTITY keyring-uri "">
 <!ENTITY current-codename "alchemist">
 
 <!ENTITY sourceslist-list-format "deb http://repo.steampowered.com/steamos &current-codename; main contrib non-free
diff --git a/vendor/ubuntu/apt-vendor.ent b/vendor/ubuntu/apt-vendor.ent
index dcebc9209..9cf7b55fb 100644
--- a/vendor/ubuntu/apt-vendor.ent
+++ b/vendor/ubuntu/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "Ubuntu">
 <!ENTITY keyring-package "<package>ubuntu-keyring</package>">
-<!ENTITY keyring-filename "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>">
-<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>">
-<!ENTITY keyring-master-filename "/usr/share/keyrings/ubuntu-master-keyring.gpg">
-<!ENTITY keyring-uri "http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg">
 
 <!ENTITY sourceslist-list-format "deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted
 deb http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted