diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 92685367..2cb8c77e 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-30  Werner Koch  <wk@gnupg.org>
+
+	* key.c (gpgme_key_get_string_attr): Return NULL when asking for
+	an issuer with IDX > 0.  We don't support altIssuerNames for now.
+
 2002-05-22  Werner Koch  <wk@gnupg.org>
 
 	* engine-gpgsm.c (_gpgme_gpgsm_op_keylist_ext): Aehmm, added
diff --git a/gpgme/key.c b/gpgme/key.c
index 43472dca..3196014c 100644
--- a/gpgme/key.c
+++ b/gpgme/key.c
@@ -972,7 +972,7 @@ gpgme_key_get_string_attr (GpgmeKey key, GpgmeAttr what,
       val = key->issuer_serial;
       break;
     case GPGME_ATTR_ISSUER:
-      val = key->issuer_name;
+      val = idx? NULL : key->issuer_name;
       break;
     case GPGME_ATTR_CHAINID:
       val = key->chain_id;