diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -1,4 +1,8 @@
 # aeson-pretty changelog
 
+## 0.8.10
+ * Added support for Aeson 2.2
+ * Added support for Aeson 2.1
+
 ## 0.8.9
  * Added support for Aeson 2.0
diff --git a/Data/Aeson/Encode/Pretty.hs b/Data/Aeson/Encode/Pretty.hs
--- a/Data/Aeson/Encode/Pretty.hs
+++ b/Data/Aeson/Encode/Pretty.hs
@@ -62,10 +62,14 @@
 import qualified Data.Aeson.Text as Aeson
 import Data.ByteString.Lazy (ByteString)
 import Data.Function (on)
-import qualified Data.HashMap.Strict as H (toList, mapKeys)
+#if !MIN_VERSION_aeson(2,0,0)
+import qualified Data.HashMap.Strict as H (toList)
+#endif
 import Data.List (intersperse, sortBy, elemIndex)
 import Data.Maybe (fromMaybe)
+#if !MIN_VERSION_base(4,13,0)
 import Data.Semigroup ((<>))
+#endif
 import qualified Data.Scientific as S (Scientific, FPFormat(..))
 import Data.Ord (comparing)
 import Data.Text (Text)
@@ -150,7 +154,7 @@
 encodePrettyToTextBuilder :: ToJSON a => a -> Builder
 encodePrettyToTextBuilder = encodePrettyToTextBuilder' defConfig
 
--- |A variant of 'encodeToTextBuilder' that takes an additional configuration
+-- |A variant of 'Aeson.encodeToTextBuilder' that takes an additional configuration
 --  parameter.
 encodePrettyToTextBuilder' :: ToJSON a => Config -> a -> Builder
 encodePrettyToTextBuilder' Config{..} x = fromValue st (toJSON x) <> trail
diff --git a/README.markdown b/README.markdown
--- a/README.markdown
+++ b/README.markdown
@@ -1,7 +1,5 @@
 # Welcome to aeson-pretty
 
-[![Build Status](https://travis-ci.org/informatikr/aeson-pretty.svg?branch=master)](https://travis-ci.org/informatikr/aeson-pretty)
-
 This is a JSON pretty-printing Haskell library compatible with [aeson](http://hackage.haskell.org/package/aeson) as well as a command-line tool to improve readabilty of streams of JSON data.
 
 The **library** provides a single function `encodePretty`. It is a drop-in replacement for aeson's `encode` function, producing JSON-ByteStrings for human readers.
@@ -20,6 +18,9 @@
 
 * `git clone git://github.com/informatikr/aeson-pretty.git`
 
+# Aeson / GHC support
+We support all GHCs supported by the latest Aeson release. This in turn determines which Aeson releases we support.
+
 # Authors
 
-This library is written and maintained by Falko Peters, <falko.peters@gmail.com>.
+This library is written by Falko Peters <falko.peters@gmail.com> and maintained by Martijn Bastiaan <martijn@qbaylogic.com>.
diff --git a/aeson-pretty.cabal b/aeson-pretty.cabal
--- a/aeson-pretty.cabal
+++ b/aeson-pretty.cabal
@@ -1,6 +1,6 @@
 cabal-version:  2.0
 name:           aeson-pretty
-version:        0.8.9
+version:        0.8.10
 license:        BSD3
 license-file:   LICENSE
 category:       Text, Web, JSON, Pretty Printer
@@ -41,14 +41,14 @@
         Data.Aeson.Encode.Pretty
 
     build-depends:
-        aeson ^>= 1.0 || ^>=1.1 || ^>=1.2 || ^>=1.3 || ^>=1.4 || ^>=1.5 || ^>=2.0,
+        aeson ^>=1.1 || ^>=1.2 || ^>=1.3 || ^>=1.4 || ^>=1.5 || ^>=2.0 || ^>=2.1 || ^>=2.2,
         base >= 4.5,
         base-compat >= 0.9,
         bytestring >= 0.9,
         scientific >= 0.3,
         vector >= 0.9,
         text >= 0.11,
-        unordered-containers >= 0.1.3.0
+        unordered-containers >= 0.2.14.0
 
     if !impl(ghc >= 8.0)
       build-depends:
@@ -70,11 +70,13 @@
             aeson >= 0.6,
             aeson-pretty,
             attoparsec >= 0.10,
+            attoparsec-aeson,
             base == 4.*,
             bytestring >= 0.9,
             cmdargs >= 0.7
 
     ghc-options: -Wall
+    ghc-prof-options: -auto-all
     default-language: Haskell2010
 
 source-repository head
diff --git a/cli-tool/Main.hs b/cli-tool/Main.hs
--- a/cli-tool/Main.hs
+++ b/cli-tool/Main.hs
@@ -2,8 +2,9 @@
 module Main (main) where
 
 import Prelude hiding (interact, concat, unlines, null)
-import Data.Aeson (Value(..), json', encode)
+import Data.Aeson (Value(..), encode)
 import Data.Aeson.Encode.Pretty
+import Data.Aeson.Parser.Internal (value')
 import Data.Attoparsec.Lazy (Result(..), parse)
 import Data.ByteString.Lazy.Char8 (ByteString, interact, unlines, null)
 import Data.Version (showVersion)
@@ -53,7 +54,7 @@
     interact $ unlines . map enc . values
 
 values :: ByteString -> [Value]
-values s = case parse json' s of
+values s = case parse value' s of
             Done rest v     -> v : values rest
             Fail rest _ _
                 | null rest -> []