diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.3.1.1 (2016-02-09)
+
+- Support aeson-0.11
+
 # 0.3.1.0 (2015-12-27)
 
 - Add `Data.Aeson.Extra.TH`
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@
 
 [![Build Status](https://travis-ci.org/phadej/aeson-extra.svg?branch=master)](https://travis-ci.org/phadej/aeson-extra)
 [![Hackage](https://img.shields.io/hackage/v/aeson-extra.svg)](http://hackage.haskell.org/package/aeson-extra)
-[![Stackage LTS 3](http://stackage.org/package/monad-http/badge/lts-3)](http://stackage.org/lts-3/package/aeson-extra)
-[![Stackage Nightly](http://stackage.org/package/monad-http/badge/nightly)](http://stackage.org/nightly/package/aeson-extra)
+[![Stackage LTS 3](http://stackage.org/package/aeson-extra/badge/lts-3)](http://stackage.org/lts-3/package/aeson-extra)
+[![Stackage Nightly](http://stackage.org/package/aeson-extra/badge/nightly)](http://stackage.org/nightly/package/aeson-extra)
 
 Package provides extra funcitonality on top of
 [`aeson`](https://hackage.haskell.org/package/aeson) and
diff --git a/aeson-extra.cabal b/aeson-extra.cabal
--- a/aeson-extra.cabal
+++ b/aeson-extra.cabal
@@ -3,7 +3,7 @@
 -- see: https://github.com/sol/hpack
 
 name:           aeson-extra
-version:        0.3.1.0
+version:        0.3.1.1
 synopsis:       Extra goodies for aeson
 description:    Package provides extra funcitonality on top of @aeson@ and @aeson-compat@
 category:       Web
@@ -13,7 +13,7 @@
 maintainer:     Oleg Grenrus <oleg.grenrus@iki.fi>
 license:        BSD3
 license-file:   LICENSE
-tested-with:    GHC==7.6.3, GHC==7.8.4, GHC==7.10.3
+tested-with:    GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1
 build-type:     Simple
 cabal-version:  >= 1.10
 
@@ -30,8 +30,8 @@
       src
   ghc-options: -Wall
   build-depends:
-      base                     >=4.6  && <4.9
-    , aeson                    >=0.7.0.6 && <0.11
+      base                     >=4.6  && <4.10
+    , aeson                    >=0.7.0.6 && <0.12
     , aeson-compat             >=0.3.0.0 && <0.4
     , base-compat              >=0.6.0   && <0.10
     , bytestring               >=0.10 && <0.11
@@ -71,8 +71,8 @@
       test
   ghc-options: -Wall
   build-depends:
-      base                     >=4.6  && <4.9
-    , aeson                    >=0.7.0.6 && <0.11
+      base                     >=4.6  && <4.10
+    , aeson                    >=0.7.0.6 && <0.12
     , aeson-compat             >=0.3.0.0 && <0.4
     , base-compat              >=0.6.0   && <0.10
     , bytestring               >=0.10 && <0.11
diff --git a/src/Data/Aeson/Extra/TH.hs b/src/Data/Aeson/Extra/TH.hs
--- a/src/Data/Aeson/Extra/TH.hs
+++ b/src/Data/Aeson/Extra/TH.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP             #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 -----------------------------------------------------------------------------
@@ -8,7 +9,7 @@
 -- Maintainer  :  Oleg Grenrus <oleg.grenrus@iki.fi>
 --
 -- In addition to 'mkValue' and 'mkValue'' helpers,
--- this module exports 'Lift' 'Value' orphan instance
+-- this module exports 'Lift' 'Value' orphan instance for aeson <0.11
 module Data.Aeson.Extra.TH (
     mkValue,
     mkValue',
@@ -47,6 +48,7 @@
   where f '\'' = '"'
         f x    = x
 
+#if !MIN_VERSION_aeson(0,11,0)
 -- | From 'aeson-extra'
 --
 -- /Since: aeson-extra-0.3.1.0/
@@ -63,3 +65,4 @@
       where a' = V.toList a
     lift (Object o) = [| Object (HM.fromList . map (first T.pack) $ o') |]
       where o' = map (first T.unpack) . HM.toList $ o
+#endif