diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 3154b3ac..f597c504 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-18  Marcus Brinkmann  <marcus@g10code.de>
+
+	* keylist.c (finish_key): Clear OPD->tmp_uid.
+
 2003-05-18  Marcus Brinkmann  <marcus@g10code.de>
 
 	* verify.c (_gpgme_verify_status_handler): Return GPGME_No_Data
diff --git a/gpgme/keylist.c b/gpgme/keylist.c
index 84ac8e31..8483c491 100644
--- a/gpgme/keylist.c
+++ b/gpgme/keylist.c
@@ -331,6 +331,7 @@ finish_key (GpgmeCtx ctx, op_data_t opd)
   GpgmeKey key = opd->tmp_key;
 
   opd->tmp_key = NULL;
+  opd->tmp_uid = NULL;
 
   if (key)
     _gpgme_engine_io_event (ctx->engine, GPGME_EVENT_NEXT_KEY, key);