2 files changed, 9 insertions, 3 deletions

diff --git a/lib/KeyRing/BuildKeyDB.hs b/lib/KeyRing/BuildKeyDB.hs
index 510c820..ef4edba 100644
--- a/lib/KeyRing/BuildKeyDB.hs
+++ b/lib/KeyRing/BuildKeyDB.hs
@@ -416,9 +416,9 @@ parseSpec wkgrip spec =
             case prespec of
                 AnyMatch                               -> (KeyGrip "", Nothing)
                 EmptyMatch                             -> error "Bad key spec."
-                WorkingKeyMatch                        -> (KeyGrip $ show wkgrip, Nothing)
-                SubstringMatch (Just KeyTypeField) tag -> (KeyGrip $ show wkgrip, Just tag)
-                SubstringMatch Nothing str             -> (KeyGrip $ show wkgrip, Just str)
+                WorkingKeyMatch                        -> (KeyExact wkgrip, Nothing)
+                SubstringMatch (Just KeyTypeField) tag -> (KeyExact wkgrip, Just tag)
+                SubstringMatch Nothing str             -> (KeyExact wkgrip, Just str)
                 SubstringMatch (Just UserIDField) ustr -> (KeyUidMatch ustr, Nothing)
                 FingerprintMatch fp                    -> (KeyGrip fp, Nothing)
         else
@@ -780,6 +780,11 @@ is40digitHex xs = ys == xs && length ys==40
         ishex c = False
 
 matchSpec :: KeySpec -> KeyData -> Bool
+matchSpec (KeyExact Nothing) _ = False
+matchSpec (KeyExact (Just grip)) (KeyData p _ _ _)
+    | matchpr grip (packet p) = True
+    | otherwise               = False
+
 matchSpec (KeyGrip grip) (KeyData p _ _ _)
     | matchpr' grip (packet p) = True
     | otherwise                = False
diff --git a/lib/KeyRing/Types.hs b/lib/KeyRing/Types.hs
index 1a12a61..99986e1 100644
--- a/lib/KeyRing/Types.hs
+++ b/lib/KeyRing/Types.hs
@@ -367,6 +367,7 @@ matchpr'' fp k | otherwise = ""
 
 data KeySpec =
       KeyGrip String       -- fp:
+    | KeyExact (Maybe Fingerprint)
     | KeyTag Packet String -- fp:????/t:
     | KeyUidMatch String   -- u:
  deriving Show