diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 37334e47..efc57e99 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -2,6 +2,8 @@
 
 	* gpgme.h (struct _gpgme_key): Add field is_qualified.
 	(struct _gpgme_subkey): Likewise.
+	* keylist.c (set_subkey_capability, set_mainkey_capability): Set
+	field is_qualified.
 
 2005-09-23  Werner Koch  <wk@g10code.com>
 
diff --git a/gpgme/keylist.c b/gpgme/keylist.c
index 8f9cf375..e786fe17 100644
--- a/gpgme/keylist.c
+++ b/gpgme/keylist.c
@@ -246,6 +246,10 @@ set_subkey_capability (gpgme_subkey_t subkey, const char *src)
 	  subkey->can_authenticate = 1;
 	  break;
 
+	case 'q':
+	  subkey->is_qualified = 1;
+	  break;
+
 	case 'd':
 	  subkey->disabled = 1;
 	  break;
@@ -294,6 +298,11 @@ set_mainkey_capability (gpgme_key_t key, const char *src)
 	case 'A':
 	  key->can_authenticate = 1;
 	  break;
+
+	case 'q':
+	case 'Q':
+	  key->is_qualified = 1;
+	  break;
         }
       src++;
     }