diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+0.6.1
+-----
+
+* Minor internal changes to fix build on GHC 7.10.
+
 0.6
 ---
 
diff --git a/Jose/Types.hs b/Jose/Types.hs
--- a/Jose/Types.hs
+++ b/Jose/Types.hs
@@ -32,13 +32,11 @@
 import Data.Int (Int64)
 import Data.Time.Clock (UTCTime)
 import Data.Time.Clock.POSIX
-import Data.Time.Format
 import Data.Text (Text)
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as TE
 import Data.Vector (singleton)
 import GHC.Generics
-import System.Locale (defaultTimeLocale)
 
 import Jose.Jwa (JweAlg(..), JwsAlg (..), Enc(..))
 
@@ -84,10 +82,11 @@
 
 instance FromJSON KeyId
   where
-    parseJSON = withText "KeyId" $ \t ->
-        case parseTime defaultTimeLocale "%FT%T%QZ" (T.unpack t) of
-            Just d -> pure (UTCKeyId d)
-            _      -> pure (KeyId t)
+    parseJSON = withText "KeyId" $ \t -> do
+        let asTime = fromJSON (String t) :: Result UTCTime
+        case asTime of
+            Success d -> pure (UTCKeyId d)
+            _         -> pure (KeyId t)
 
 -- | Header content for a JWS.
 data JwsHeader = JwsHeader {
diff --git a/jose-jwt.cabal b/jose-jwt.cabal
--- a/jose-jwt.cabal
+++ b/jose-jwt.cabal
@@ -1,5 +1,5 @@
 Name:               jose-jwt
-Version:            0.6
+Version:            0.6.1
 Synopsis:           JSON Object Signing and Encryption Library
 Homepage:           http://github.com/tekul/jose-jwt
 Bug-Reports:        http://github.com/tekul/jose-jwt/issues