diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+0.8.2
+-----
+
+- Support for servant-0.11
+    Add `HasMock EmptyAPI` instance
+
 0.8.1.2
 -------
 
diff --git a/servant-mock.cabal b/servant-mock.cabal
--- a/servant-mock.cabal
+++ b/servant-mock.cabal
@@ -1,5 +1,5 @@
 name:                servant-mock
-version:             0.8.1.2
+version:             0.8.2
 synopsis:            Derive a mock server for free from your servant API types
 description:
   Derive a mock server for free from your servant API types
@@ -33,8 +33,8 @@
     base            >=4.7    && <5,
     bytestring      >=0.10.4 && <0.11,
     http-types      >=0.8    && <0.10,
-    servant         >=0.8    && <0.11,
-    servant-server  >=0.8    && <0.11,
+    servant         >=0.8    && <0.12,
+    servant-server  >=0.8    && <0.12,
     transformers    >=0.3    && <0.6,
     QuickCheck      >=2.7    && <2.10,
     wai             >=3.0    && <3.3
diff --git a/src/Servant/Mock.hs b/src/Servant/Mock.hs
--- a/src/Servant/Mock.hs
+++ b/src/Servant/Mock.hs
@@ -160,11 +160,20 @@
   mock _ _ = mockArbitrary
 
 instance HasMock Raw context where
+#if MIN_VERSION_servant(0,11,0)
+  mock _ _ = Tagged $ \_req respond -> do
+#else
   mock _ _ = \_req respond -> do
+#endif
     bdy <- genBody
     respond $ responseLBS status200 [] bdy
 
     where genBody = pack <$> generate (vector 100 :: Gen [Char])
+
+#if MIN_VERSION_servant(0,11,0)
+instance HasMock EmptyAPI context where
+    mock _ _ = emptyServer
+#endif
 
 instance (HasContextEntry context (NamedContext name subContext), HasMock rest subContext) =>
   HasMock (WithNamedContext name subContext rest) context where