diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/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
 ----
 
@@ -147,7 +152,7 @@
   Just like `hoistServer` allows us to change the monad in which request handlers
   of a web application live in, we also have `hoistClient` for changing the monad
   in which *client functions* live.
-  Read [tutorial section for more information](https://haskell-servant.readthedocs.io/en/release-0.14/tutorial/Client.html#changing-the-monad-the-client-functions-live-in).
+  Read [tutorial section for more information](https://docs.servant.dev/en/release-0.14/tutorial/Client.html#changing-the-monad-the-client-functions-live-in).
   ([#936](https://github.com/haskell-servant/servant/pull/936))
 
 - *servant-client* Add more constructors to `RequestBody`, including
diff --git a/servant-client.cabal b/servant-client.cabal
--- a/servant-client.cabal
+++ b/servant-client.cabal
@@ -1,6 +1,6 @@
 cabal-version:       >=1.10
 name:                servant-client
-version:             0.16
+version:             0.16.0.1
 
 synopsis:            Automatic derivation of querying functions for servant
 category:            Servant, Web
@@ -8,11 +8,11 @@
   This library lets you derive automatically Haskell functions that
   let you query each endpoint of a <http://hackage.haskell.org/package/servant servant> webservice.
   .
-  See <http://haskell-servant.readthedocs.org/en/stable/tutorial/Client.html the client section of the tutorial>.
+  See <http://docs.servant.dev/en/stable/tutorial/Client.html the client section of the tutorial>.
   .
   <https://github.com/haskell-servant/servant/blob/master/servant-client/CHANGELOG.md CHANGELOG>
 
-homepage:            http://haskell-servant.readthedocs.org/
+homepage:            http://docs.servant.dev/
 bug-reports:         http://github.com/haskell-servant/servant/issues
 license:             BSD3
 license-file:        LICENSE
@@ -24,7 +24,8 @@
   GHC ==8.0.2
    || ==8.2.2
    || ==8.4.4
-   || ==8.6.3
+   || ==8.6.5
+   || ==8.8.1
 
 extra-source-files:
   CHANGELOG.md
@@ -44,14 +45,14 @@
   -- Bundled with GHC: Lower bound to not force re-installs
   -- text and mtl are bundled starting with GHC-8.4
   build-depends:
-      base                  >= 4.9      && < 4.13
+      base                  >= 4.9      && < 4.14
     , bytestring            >= 0.10.8.1 && < 0.11
     , containers            >= 0.5.7.1  && < 0.7
     , deepseq               >= 1.4.2.0  && < 1.5
     , mtl                   >= 2.2.2    && < 2.3
     , stm                   >= 2.4.5.1  && < 2.6
     , text                  >= 1.2.3.0  && < 1.3
-    , time                  >= 1.6.0.1  && < 1.9
+    , time                  >= 1.6.0.1  && < 1.10
     , transformers          >= 0.5.2.0  && < 0.6
 
   if !impl(ghc >= 8.2)
@@ -67,9 +68,9 @@
   -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
   -- Here can be exceptions if we really need features from the newer versions.
   build-depends:
-      base-compat           >= 0.10.5   && < 0.11
+      base-compat           >= 0.10.5   && < 0.12
     , http-client           >= 0.5.13.1 && < 0.7
-    , http-media            >= 0.7.1.3  && < 0.8
+    , http-media            >= 0.7.1.3  && < 0.9
     , http-types            >= 0.12.2   && < 0.13
     , exceptions            >= 0.10.0   && < 0.11
     , kan-extensions        >= 5.2      && < 5.3
@@ -117,8 +118,8 @@
       entropy           >= 0.4.1.3  && < 0.5
     , hspec             >= 2.6.0    && < 2.8
     , HUnit             >= 1.6.0.0  && < 1.7
-    , network           >= 2.8.0.0  && < 3.1
-    , QuickCheck        >= 2.12.6.1 && < 2.13
+    , network           >= 2.8.0.0  && < 3.2
+    , QuickCheck        >= 2.12.6.1 && < 2.14
     , servant           == 0.16.*
     , servant-server    == 0.16.*
     , tdigest           >= 0.2     && < 0.3
diff --git a/src/Servant/Client/Internal/HttpClient.hs b/src/Servant/Client/Internal/HttpClient.hs
--- a/src/Servant/Client/Internal/HttpClient.hs
+++ b/src/Servant/Client/Internal/HttpClient.hs
@@ -16,10 +16,11 @@
 
 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.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 @@
                  (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