diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 86506efd..df4f8403 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-06  Marcus Brinkmann  <marcus@g10code.de>
+
+	* rungpg.c (_gpgme_gpg_op_keylist): Remove handling of keylist
+	mode (for now).
+
 2002-02-06  Marcus Brinkmann  <marcus@g10code.de>
 
 	* wait.c (gpgme_wait): Add new argument STATUS, in which the
diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c
index 02de0046..83581445 100644
--- a/gpgme/rungpg.c
+++ b/gpgme/rungpg.c
@@ -1374,8 +1374,6 @@ _gpgme_gpg_op_keylist (GpgObject gpg, const char *pattern, int secret_only,
     err = _gpgme_gpg_add_arg (gpg, "--fixed-list-mode");
   if (!err)
     err = _gpgme_gpg_add_arg (gpg, "--with-fingerprint");
-  if (!err && keylist_mode == 1)
-    err = _gpgme_gpg_add_arg (gpg, "--no-expensive-trust-checks");
   if (!err)
     err = _gpgme_gpg_add_arg (gpg, secret_only ? "--list-secret-keys"
 			      : "--list-keys");