diff --git a/pinboard.cabal b/pinboard.cabal
--- a/pinboard.cabal
+++ b/pinboard.cabal
@@ -1,5 +1,5 @@
 name:                pinboard
-version:             0.6
+version:             0.6.1
 synopsis:            Access to the Pinboard API
 license:             MIT
 license-file:        LICENSE
@@ -43,10 +43,9 @@
                      , io-streams
                      , mtl >= 2.1.3.1
                      , network
-                     , old-locale
                      , random >= 1.1
                      , text
-                     , time
+                     , time >= 1.5
                      , transformers
                      , unordered-containers
               
diff --git a/src/Pinboard/Api.hs b/src/Pinboard/Api.hs
--- a/src/Pinboard/Api.hs
+++ b/src/Pinboard/Api.hs
@@ -37,13 +37,15 @@
 
 import Pinboard.Client          (pinboardJson)
 import Pinboard.Client.Types    (Pinboard)
-import Control.Applicative      ((<$>))
 import Data.Text                (Text)
 import Data.Time                (UTCTime)
 import Pinboard.Client.Types    (ResultFormatType (..))
 import Pinboard.ApiTypes        
 import Pinboard.ApiRequest
-                                            
+
+import Control.Applicative
+import Prelude                                            
+
 -- POSTS ---------------------------------------------------------------------
 
 -- | posts/recent : Returns a list of the user's most recent posts, filtered by tag.
diff --git a/src/Pinboard/ApiRequest.hs b/src/Pinboard/ApiRequest.hs
--- a/src/Pinboard/ApiRequest.hs
+++ b/src/Pinboard/ApiRequest.hs
@@ -35,14 +35,15 @@
       getNoteRequest,
     ) where
 
-import Prelude hiding (unwords)
 import Pinboard.Client.Types    (PinboardRequest (..), Param (..))
 import Pinboard.Client.Util     ((</>))
-import Control.Applicative      ((<$>))
 import Data.Text                (unwords)
 import Data.Maybe               (catMaybes)
 import Pinboard.ApiTypes        
 import Pinboard.Client.Types    (ResultFormatType (..))
+
+import Control.Applicative
+import Prelude hiding (unwords)
 
                                             
 -- POSTS ---------------------------------------------------------------------
diff --git a/src/Pinboard/ApiTypes.hs b/src/Pinboard/ApiTypes.hs
--- a/src/Pinboard/ApiTypes.hs
+++ b/src/Pinboard/ApiTypes.hs
@@ -10,8 +10,6 @@
 -- Portability : POSIX
 module Pinboard.ApiTypes where
 
-import Prelude hiding      (words)
-import Control.Applicative ((<$>), (<*>), (<|>))
 import Data.Aeson          (FromJSON (parseJSON), Value (String, Object), ( .:))
 import Data.Aeson.Types    (Parser)
 import Data.HashMap.Strict (HashMap, member, toList)
@@ -19,10 +17,12 @@
 import Data.Text           (Text, words, unpack)
 import Data.Time           (UTCTime)
 import Data.Time.Calendar  (Day)
-import Data.Time.Format    (readTime)
-import System.Locale       (defaultTimeLocale)
+import Data.Time.Format    (parseTimeOrError, defaultTimeLocale)
 import qualified Data.HashMap.Strict as HM
 
+import Control.Applicative 
+import Prelude hiding      (words)
+
 -- * Posts
 
 data Posts = Posts {
@@ -145,7 +145,7 @@
    parseJSON _ = error "bad parse"
 
 readNoteTime :: String -> UTCTime
-readNoteTime = readTime defaultTimeLocale "%F %T"
+readNoteTime = parseTimeOrError True defaultTimeLocale "%F %T"
 
 
 -- * Tags
diff --git a/src/Pinboard/Client.hs b/src/Pinboard/Client.hs
--- a/src/Pinboard/Client.hs
+++ b/src/Pinboard/Client.hs
@@ -49,7 +49,6 @@
     ) where
 
 
-import Control.Applicative        ((<$>))
 import Control.Exception          (catch, SomeException, try, bracket)
 import Control.Monad.IO.Class     (MonadIO (liftIO))
 import Control.Monad.Reader       (ask, runReaderT)
@@ -76,7 +75,10 @@
 import qualified Data.Text                   as T
 import qualified Data.Text.Encoding          as T
 
+import Control.Applicative
+import Prelude
 
+
 -- | Create a default PinboardConfig using the supplied apiToken
 fromApiToken :: String -> PinboardConfig
 fromApiToken token = PinboardConfig { debug = False, apiToken = pack token }
@@ -158,7 +160,7 @@
 buildReq url = buildRequest $ do
   http GET ("/v1/" <> url)
   setHeader "Connection" "Keep-Alive"  
-  setHeader "User-Agent" "pinboard.hs/0.6"  
+  setHeader "User-Agent" "pinboard.hs/0.6.1"  
 
 --------------------------------------------------------------------------------
 
diff --git a/src/Pinboard/Client/Error.hs b/src/Pinboard/Client/Error.hs
--- a/src/Pinboard/Client/Error.hs
+++ b/src/Pinboard/Client/Error.hs
@@ -13,8 +13,10 @@
     , PinboardError         (..)
     ) where
 
-import           Data.Text           (Text)
-import Data.Monoid(mempty)
+import Data.Text (Text)
+
+import Data.Monoid
+import Prelude
 
 ------------------------------------------------------------------------------
 data PinboardErrorHTTPCode = 
diff --git a/src/Pinboard/Client/Util.hs b/src/Pinboard/Client/Util.hs
--- a/src/Pinboard/Client/Util.hs
+++ b/src/Pinboard/Client/Util.hs
@@ -19,13 +19,15 @@
     , ensureResultFormatType
     ) where
 
-import           Data.Monoid           (Monoid, mconcat, mempty, (<>))
 import           Data.String           (IsString)
 import           Data.Text             (Text)
 import qualified Data.Text             as T
 import qualified Data.Text.Encoding    as T
 import           Pinboard.Client.Types (PinboardRequest (..), PinboardConfig (..), ResultFormatType (..), Param (..), ParamsBS)
 import Network.HTTP.Types(urlEncode)
+
+import Data.Monoid
+import Prelude
 
 ------------------------------------------------------------------------------