1 files changed, 5 insertions, 1 deletions

diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index fc21122..9c734fc 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -3121,7 +3121,9 @@ makeSig doDecrypt top fname subkey_p tags mbsig = do
             let mp' = mappedPacket fname new_sig
             return $ KikiSuccess (mp', Map.empty)
         parsedkey = [packet subkey_p]
-        hashed0 = KeyFlagsPacket
+        hashed0 | any isFlagsPacket tags = tags
+                | otherwise
+                  = KeyFlagsPacket
                     { certify_keys = False
                     , sign_data = False
                     , encrypt_communication = False
@@ -3132,6 +3134,8 @@ makeSig doDecrypt top fname subkey_p tags mbsig = do
                     : tags
                     -- implicitly added:
                     -- , SignatureCreationTimePacket (fromIntegral timestamp)
+        isFlagsPacket (KeyFlagsPacket {}) = True
+        isFlagsPacket _                   = False
         subgrip = fingerprint (head parsedkey)
 
     back_sig <- pgpSign (Message parsedkey)