diff --git a/Codec/Encryption/OpenPGP/Serialize.hs b/Codec/Encryption/OpenPGP/Serialize.hs
--- a/Codec/Encryption/OpenPGP/Serialize.hs
+++ b/Codec/Encryption/OpenPGP/Serialize.hs
@@ -408,7 +408,9 @@
 ffSetToBS = B.pack . ffSetToBS'
     where
         ffSetToBS' :: FutureFlag a => Set a -> [Word8]
-        ffSetToBS' ks = map ((foldl (.|.) 0 .  map (shiftR 128 . flip mod 8 . fromFFlag) . Set.toAscList) . (\ x -> Set.filter (\ y -> fromFFlag y `div` 8 == x) ks)) [0 .. fromFFlag (Set.findMax ks) `div` 8]
+        ffSetToBS' ks
+          | Set.null ks = [] -- FIXME: should this be [0]?
+          | otherwise = map ((foldl (.|.) 0 .  map (shiftR 128 . flip mod 8 . fromFFlag) . Set.toAscList) . (\ x -> Set.filter (\ y -> fromFFlag y `div` 8 == x) ks)) [0 .. fromFFlag (Set.findMax ks) `div` 8]
 
 fromS2K :: S2K -> ByteString
 fromS2K (Simple hashalgo) = B.pack [0, fromIntegral . fromFVal $ hashalgo]
@@ -1201,7 +1203,9 @@
     putByteString ub
     putWord16be left16
     mapM_ put mpis
-putSignaturePayload _ = fail "Signature version not supported"
+putSignaturePayload (SigVOther pv bs) = do
+    putWord8 pv
+    putByteString bs
 
 -- Stolen from Axman6
 many :: Get a -> Get [a]
diff --git a/Data/Conduit/OpenPGP/Keyring.hs b/Data/Conduit/OpenPGP/Keyring.hs
--- a/Data/Conduit/OpenPGP/Keyring.hs
+++ b/Data/Conduit/OpenPGP/Keyring.hs
@@ -13,6 +13,7 @@
 import Data.Conduit
 import qualified Data.Conduit.List as CL
 import Data.IxSet (empty, insert)
+import Data.Foldable (traverse_)
 
 import Codec.Encryption.OpenPGP.Internal (sigType)
 import Codec.Encryption.OpenPGP.Types
@@ -38,7 +39,7 @@
             let (accum', bs) = f a accum
             Prelude.mapM_ yield bs
             loop accum'
-        finalyield = maybe (return ()) yield . snd
+        finalyield = traverse_ yield . snd
 
 conduitToTKs' :: MonadResource m => Bool -> Conduit Pkt m TK
 conduitToTKs' intolerant = fakecmAccum push (MainKey, Nothing)
diff --git a/hOpenPGP.cabal b/hOpenPGP.cabal
--- a/hOpenPGP.cabal
+++ b/hOpenPGP.cabal
@@ -1,5 +1,5 @@
 Name:                hOpenPGP
-Version:             0.11
+Version:             0.11.1
 Synopsis:            native Haskell implementation of OpenPGP (RFC4880)
 Description:         native Haskell implementation of OpenPGP (RFC4880)
 Homepage:            http://floss.scru.org/hOpenPGP/
@@ -234,4 +234,4 @@
 source-repository this
   type:     git
   location: git://git.debian.org/users/clint/hOpenPGP.git
-  tag:      v0.11
+  tag:      v0.11.1
