1 files changed, 6 insertions, 3 deletions

diff --git a/lib/KeyRing/Types.hs b/lib/KeyRing/Types.hs
index dbcc22c..c272efc 100644
--- a/lib/KeyRing/Types.hs
+++ b/lib/KeyRing/Types.hs
@@ -32,13 +32,16 @@ data KeyRingOperation = KeyRingOperation
     -- ^ If provided, this is the directory where the 'HomeSec' and 'HomePub'
     -- files reside.  Otherwise, the evironment variable $GNUPGHOME is consulted
     -- and if that is not set, it falls back to $HOME/.gnupg.
+    , preferredPGPVersion :: Word8
+    -- ^ Newly created PGP key packets will use this version.  It should be set
+    -- to either 4 or 5.
     }
   deriving (Eq,Show)
 instance Semigroup KeyRingOperation where
-  KeyRingOperation f p t h <> KeyRingOperation f' p' t' h' =
-    KeyRingOperation (f <> f') (p <> p') (t <> t') (h <> h')
+  KeyRingOperation f p t h v <> KeyRingOperation f' p' t' h' v' =
+    KeyRingOperation (f <> f') (p <> p') (t <> t') (h <> h') (max v v')
 instance Monoid KeyRingOperation where
-  mempty = KeyRingOperation Map.empty [] [] Nothing
+  mempty = KeyRingOperation Map.empty [] [] Nothing 4
 
 data InputFile = HomeSec
                -- ^ A file named secring.gpg located in the home directory.