diff --git a/cabal.haskell-ci b/cabal.haskell-ci
index 9f6d4bf0..518ed6fe 100644
--- a/cabal.haskell-ci
+++ b/cabal.haskell-ci
@@ -21,4 +21,8 @@ constraint-set http-media-0.8
 constraint-set http-media-0.7
   constraints: http-media ==0.7.*
 
-head-hackage: >= 8.8
+constraint-set base-compat-0.10
+  constraints: base-compat ==0.10.*
+
+constraint-set base-compat-0.11
+  constraints: base-compat ==0.11.*
diff --git a/cabal.project b/cabal.project
index f6a69ff2..f257991e 100644
--- a/cabal.project
+++ b/cabal.project
@@ -46,6 +46,7 @@ allow-newer:
 
 allow-newer:
   servant-js:base,
+  servant-js:base-compat,
   servant-js:lens
 
 allow-newer:
@@ -57,6 +58,7 @@ allow-newer:
 -- servant-quickcheck
 allow-newer:
   servant-quickcheck:base,
+  servant-quickcheck:base-compat,
   servant-quickcheck:hspec,
   servant-quickcheck:http-client,
   servant-quickcheck:http-media,
@@ -67,6 +69,9 @@ allow-newer:
   servant-quickcheck:time,
   servant-quickcheck:warp
 
+allow-newer: aeson-pretty:base-compat
+
+
 -- constraints: semigroups ^>=0.19
 -- constraints: hashable ^>=1.3
 -- constraints: network ^>=3.1
diff --git a/servant-client/CHANGELOG.md b/servant-client/CHANGELOG.md
index aa144cab..02f7bd85 100644
--- a/servant-client/CHANGELOG.md
+++ b/servant-client/CHANGELOG.md
@@ -1,6 +1,11 @@
 [The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-client/CHANGELOG.md)
 [Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
 
+0.16.0.1
+--------
+
+- Allow `base-compat-0.11`
+
 0.16
 ----
 
diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal
index e3524615..1a91f34f 100644
--- a/servant-client/servant-client.cabal
+++ b/servant-client/servant-client.cabal
@@ -1,7 +1,6 @@
 cabal-version:       >=1.10
 name:                servant-client
-version:             0.16
-x-revision:          3
+version:             0.16.0.1
 
 synopsis:            Automatic derivation of querying functions for servant
 category:            Servant, Web
diff --git a/servant-client/src/Servant/Client/Internal/HttpClient.hs b/servant-client/src/Servant/Client/Internal/HttpClient.hs
index 1feb56d6..ec8a63e5 100644
--- a/servant-client/src/Servant/Client/Internal/HttpClient.hs
+++ b/servant-client/src/Servant/Client/Internal/HttpClient.hs
@@ -16,10 +16,11 @@ import           Prelude.Compat
 
 import           Control.Concurrent.MVar
                  (modifyMVar, newMVar)
-import qualified Data.ByteString                          as BS
 import           Control.Concurrent.STM.TVar
 import           Control.Exception
+                 (SomeException (..), catch)
 import           Control.Monad
+                 (unless)
 import           Control.Monad.Base
                  (MonadBase (..))
 import           Control.Monad.Catch
@@ -27,15 +28,18 @@ import           Control.Monad.Catch
 import           Control.Monad.Error.Class
                  (MonadError (..))
 import           Control.Monad.IO.Class
-                 (liftIO)
+                 (MonadIO (..))
 import           Control.Monad.Reader
+                 (MonadReader, ReaderT, ask, runReaderT)
 import           Control.Monad.STM
                  (STM, atomically)
 import           Control.Monad.Trans.Control
                  (MonadBaseControl (..))
 import           Control.Monad.Trans.Except
+                 (ExceptT, runExceptT)
 import           Data.Bifunctor
                  (bimap)
+import qualified Data.ByteString             as BS
 import           Data.ByteString.Builder
                  (toLazyByteString)
 import qualified Data.ByteString.Lazy        as BSL
@@ -64,8 +68,8 @@ import           Network.HTTP.Types
                  (hContentType, renderQuery, statusCode)
 import           Servant.Client.Core
 
-import qualified Servant.Types.SourceT                    as S
 import qualified Network.HTTP.Client         as Client
+import qualified Servant.Types.SourceT       as S
 
 -- | The environment in which a request is run.
 data ClientEnv
diff --git a/servant-http-streams/CHANGELOG.md b/servant-http-streams/CHANGELOG.md
index 7bf14e4f..19b1f6b1 100644
--- a/servant-http-streams/CHANGELOG.md
+++ b/servant-http-streams/CHANGELOG.md
@@ -1,6 +1,11 @@
   [The latest version of this document is on GitHub.](https://github.com/haskell-servant/servant/blob/master/servant-http-streams/CHANGELOG.md)
 [Changelog for `servant` package contains significant entries for all core packages.](https://github.com/haskell-servant/servant/blob/master/servant/CHANGELOG.md)
 
+0.16.0.1
+--------
+
+- Allow `base-compat-0.11`
+
 0.16
 ----
 
diff --git a/servant-http-streams/src/Servant/HttpStreams/Internal.hs b/servant-http-streams/src/Servant/HttpStreams/Internal.hs
index 3c5fb7e4..54c920bc 100644
--- a/servant-http-streams/src/Servant/HttpStreams/Internal.hs
+++ b/servant-http-streams/src/Servant/HttpStreams/Internal.hs
@@ -18,6 +18,8 @@ import           Control.DeepSeq
                  (NFData, force)
 import           Control.Exception
                  (IOException, SomeException (..), catch, evaluate, throwIO)
+import           Control.Monad
+                 (unless)
 import           Control.Monad.Base
                  (MonadBase (..))
 import           Control.Monad.Codensity
@@ -25,9 +27,13 @@ import           Control.Monad.Codensity
 import           Control.Monad.Error.Class
                  (MonadError (..))
 import           Control.Monad.IO.Class
-                 (liftIO)
+                 (MonadIO (..))
 import           Control.Monad.Reader
+                 (MonadReader, ReaderT, ask, runReaderT)
+import           Control.Monad.Trans.Class
+                 (lift)
 import           Control.Monad.Trans.Except
+                 (ExceptT, runExceptT)
 import           Data.Bifunctor
                  (bimap, first)
 import           Data.ByteString.Builder