1 files changed, 4 insertions, 1 deletions
diff --git a/g10/keyid.c b/g10/keyid.c
index 7d5b905a5..7c2bd3ba4 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -547,10 +547,13 @@ usagestr_from_pk( PKT_public_key *pk )
   if ( use & PUBKEY_USAGE_SIG )
     {
       if (pk->is_primary)
-        buffer[i++] = 'C';
+        use|=PUBKEY_USAGE_CERT;
       buffer[i++] = 'S';
     }
 
+  if ( use & PUBKEY_USAGE_CERT )
+    buffer[i++] = 'C';
+
   if ( use & PUBKEY_USAGE_ENC )
     buffer[i++] = 'E';