diff --git a/CHANGELOG.yaml b/CHANGELOG.yaml
--- a/CHANGELOG.yaml
+++ b/CHANGELOG.yaml
@@ -2,6 +2,15 @@
 
 releases:
 
+  - version: "0.0.3.1"
+    changes:
+
+      - description: Support for Servant 0.11
+        issue: none
+        pr: 32
+        authors: adinapoli-iohk
+        date: 2017-10-18
+
   - version: "0.0.3.0"
     changes:
 
diff --git a/servant-quickcheck.cabal b/servant-quickcheck.cabal
--- a/servant-quickcheck.cabal
+++ b/servant-quickcheck.cabal
@@ -1,5 +1,5 @@
 name:                servant-quickcheck
-version:             0.0.3.0
+version:             0.0.3.1
 synopsis:            QuickCheck entire APIs
 description:
  This packages provides QuickCheck properties that are tested across an entire
@@ -46,9 +46,9 @@
                      , pretty == 1.1.*
                      , process >= 1.2 && < 1.5
                      , QuickCheck > 2.7 && < 2.11
-                     , servant > 0.6 && < 0.10
-                     , servant-client > 0.6 && < 0.10
-                     , servant-server > 0.6 && < 0.10
+                     , servant > 0.6 && < 0.12
+                     , servant-client > 0.6 && < 0.12
+                     , servant-server > 0.6 && < 0.12
                      , split == 0.2.*
                      , string-conversions > 0.3 && < 0.5
                      , temporary == 1.2.*
diff --git a/src/Servant/QuickCheck/Internal/HasGenRequest.hs b/src/Servant/QuickCheck/Internal/HasGenRequest.hs
--- a/src/Servant/QuickCheck/Internal/HasGenRequest.hs
+++ b/src/Servant/QuickCheck/Internal/HasGenRequest.hs
@@ -64,6 +64,10 @@
         (oldf, old) = genRequest (Proxy :: Proxy b)
         new = cs $ symbolVal (Proxy :: Proxy path)
 
+#if MIN_VERSION_servant(0,11,0)
+instance HasGenRequest EmptyAPI where
+  genRequest _ = (0, error "EmptyAPIs cannot be queried.")
+#endif
 
 instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
     => HasGenRequest (Capture x c :> b) where
diff --git a/test/Servant/QuickCheck/InternalSpec.hs b/test/Servant/QuickCheck/InternalSpec.hs
--- a/test/Servant/QuickCheck/InternalSpec.hs
+++ b/test/Servant/QuickCheck/InternalSpec.hs
@@ -38,7 +38,6 @@
 import Servant.QuickCheck.Internal (genRequest, runGenRequest,
                                     serverDoesntSatisfy)
 
-
 spec :: Spec
 spec = do
   serversEqualSpec