diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 56fd9c69..ebae9756 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-28  Marcus Brinkmann  <marcus@g10code.de>
+
+	* keylist.c (gpgme_op_keylist_ext_start): Always use our own FD
+	table (eg use synchronous mode).
+
 2002-06-28  Marcus Brinkmann  <marcus@g10code.de>
 
 	* ops.h (_gpgme_wait_on_condition): Remove HANG argument from
diff --git a/gpgme/keylist.c b/gpgme/keylist.c
index 032bac6c..5fe37011 100644
--- a/gpgme/keylist.c
+++ b/gpgme/keylist.c
@@ -620,7 +620,9 @@ gpgme_op_keylist_ext_start (GpgmeCtx ctx, const char *pattern[],
 {
   GpgmeError err = 0;
 
-  err = _gpgme_op_reset (ctx, 0);
+  /* Keylist operations are always "synchronous" in the sense that we
+     don't add ourself to the global FD table.  */
+  err = _gpgme_op_reset (ctx, 1);
   if (err)
     goto leave;