diff --git a/Data/Aeson/Generic.hs b/Data/Aeson/Generic.hs
--- a/Data/Aeson/Generic.hs
+++ b/Data/Aeson/Generic.hs
@@ -1,5 +1,10 @@
 {-# LANGUAGE PatternGuards, Rank2Types, ScopedTypeVariables, CPP #-}
 
+-- TODO: Drop this when we remove support for Data.Attoparsec.Number
+#if MIN_VERSION_attoparsec(0,12,0)
+{-# OPTIONS_GHC -fno-warn-deprecations #-}
+#endif
+
 -- |
 -- Module:      Data.Aeson.Generic
 -- Copyright:   (c) 2011, 2012, 2013 Bryan O'Sullivan
diff --git a/Data/Aeson/Parser/Internal.hs b/Data/Aeson/Parser/Internal.hs
--- a/Data/Aeson/Parser/Internal.hs
+++ b/Data/Aeson/Parser/Internal.hs
@@ -33,8 +33,8 @@
 
 import Control.Applicative ((*>), (<$>), (<*), liftA2, pure)
 import Data.Aeson.Types (Result(..), Value(..))
-import Data.Attoparsec.Char8 (Parser, char, endOfInput, scientific,
-                              skipSpace, string)
+import Data.Attoparsec.ByteString.Char8 (Parser, char, endOfInput, scientific,
+                                         skipSpace, string)
 import Data.Bits ((.|.), shiftL)
 import Data.ByteString (ByteString)
 import Data.Char (chr)
@@ -43,7 +43,7 @@
 import Data.Text.Encoding (decodeUtf8')
 import Data.Vector as Vector (Vector, fromList)
 import Data.Word (Word8)
-import qualified Data.Attoparsec as A
+import qualified Data.Attoparsec.ByteString as A
 import qualified Data.Attoparsec.Lazy as L
 import qualified Data.Attoparsec.Zepto as Z
 import qualified Data.ByteString as B
diff --git a/Data/Aeson/Types/Instances.hs b/Data/Aeson/Types/Instances.hs
--- a/Data/Aeson/Types/Instances.hs
+++ b/Data/Aeson/Types/Instances.hs
@@ -7,6 +7,11 @@
 {-# LANGUAGE DefaultSignatures #-}
 #endif
 
+-- TODO: Drop this when we remove support for Data.Attoparsec.Number
+#if MIN_VERSION_attoparsec(0,12,0)
+{-# OPTIONS_GHC -fno-warn-deprecations #-}
+#endif
+
 -- |
 -- Module:      Data.Aeson.Types.Instances
 -- Copyright:   (c) 2011-2013 Bryan O'Sullivan
@@ -71,7 +76,11 @@
 import Data.Vector (Vector)
 import Data.Word (Word, Word8, Word16, Word32, Word64)
 import Foreign.Storable (Storable)
+#if MIN_VERSION_time(1,5,0)
+import Data.Time.Format(defaultTimeLocale, dateTimeFmt)
+#else
 import System.Locale (defaultTimeLocale, dateTimeFmt)
+#endif
 import qualified Data.HashMap.Strict as H
 import qualified Data.HashSet as HashSet
 import qualified Data.IntMap as IntMap
diff --git a/aeson.cabal b/aeson.cabal
--- a/aeson.cabal
+++ b/aeson.cabal
@@ -1,5 +1,5 @@
 name:            aeson
-version:         0.8.0.0
+version:         0.8.0.1
 license:         BSD3
 license-file:    LICENSE
 category:        Text, Web, JSON
@@ -74,6 +74,12 @@
   default: False
   manual: True
 
+flag old-locale
+  description: If false then depend on time >= 1.5.
+               .
+               If true then depend on time < 1.5 together with old-locale.
+  default: False
+
 library
   exposed-modules:
     Data.Aeson
@@ -102,14 +108,17 @@
     ghc-prim >= 0.2,
     hashable >= 1.1.2.0,
     mtl,
-    old-locale,
     scientific >= 0.3.1 && < 0.4,
     syb,
     template-haskell >= 2.4,
     text >= 1.1.1.0,
-    time,
     unordered-containers >= 0.2.3.0,
     vector >= 0.7.1
+
+  if flag(old-locale)
+    build-depends: time < 1.5, old-locale
+  else
+    build-depends: time >= 1.5
 
   if flag(developer)
     ghc-options: -Werror
diff --git a/changelog.md b/changelog.md
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,7 @@
+0.8.0.1
+
+* Support time-1.5.
+
 0.8.0.0
 
 * Add ToJSON and FromJSON instances for tuples of up to 15 elements.