diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+- 0.2.3.2.2.8
+    - Support `servant-0.11`
+
 - 0.2.2.2.2.8
     - Support `servant-0.10`
 
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # servant-swagger-ui
 
-> Servant support for yaml
+*Provide a Swagger UI for your Servant API*
+
+"[Swagger UI](http://swagger.io/swagger-ui/) allows anyone — be it your development team or your end consumers — to visualize and interact with the API’s resources without having any of the implementation logic in place."
 
 [![Build Status](https://travis-ci.org/phadej/servant-swagger-ui.svg?branch=master)](https://travis-ci.org/phadej/servant-swagger-ui)
 [![Hackage](https://img.shields.io/hackage/v/servant-swagger-ui.svg)](http://hackage.haskell.org/package/servant-swagger-ui)
diff --git a/servant-swagger-ui.cabal b/servant-swagger-ui.cabal
--- a/servant-swagger-ui.cabal
+++ b/servant-swagger-ui.cabal
@@ -1,5 +1,5 @@
 name:           servant-swagger-ui
-version:        0.2.2.2.2.8
+version:        0.2.3.2.2.8
 synopsis:       Servant swagger ui
 description:    Provide embedded swagger UI for servant and swagger (i.e. servant-swagger)
 category:       Web
@@ -140,9 +140,9 @@
     , file-embed        >=0.0.9    && <0.1
     , filepath          >=1.3.0.2  && <1.5
     , http-media        >=0.6.2    && <0.8
-    , servant           >=0.4.4.5  && <0.11
+    , servant           >=0.4.4.5  && <0.12
     , servant-blaze     >=0.4.4.5  && <0.9
-    , servant-server    >=0.4.4.5  && <0.11
+    , servant-server    >=0.4.4.5  && <0.12
     , servant-swagger   >=1.0.3    && <1.2
     , swagger2          >=2.0.1    && <2.2
     , template-haskell  >=2.9      && <2.12
@@ -176,7 +176,7 @@
     , servant-swagger-ui
     , swagger2
     , text
-    , aeson          >=0.8.0.2  && <1.2
+    , aeson          >=0.8.0.2  && <1.3
     , base-compat    >=0.6.0    && <0.10
     , lens           >=4.7.0.1  && <4.16
     , wai            >=3.0.3.0  && <3.3
diff --git a/src/Servant/Swagger/UI.hs b/src/Servant/Swagger/UI.hs
--- a/src/Servant/Swagger/UI.hs
+++ b/src/Servant/Swagger/UI.hs
@@ -30,7 +30,7 @@
 --     :\<|> "cat" :> Capture ":name" CatName :> Get '[JSON] Cat
 --
 -- -- | API type with bells and whistles, i.e. schema file and swagger-ui.
--- type API = 'SwaggerSchemaUI' "swagger.json" "swagger-ui"
+-- type API = 'SwaggerSchemaUI' "swagger-ui" "swagger.json"
 --     :\<|> BasicAPI
 --
 -- -- | Servant server for an API
@@ -167,7 +167,11 @@
     :<|> return (SwaggerUiHtml indexTemplate)
     :<|> rest
   where
-    rest = staticApp $ embeddedSettings files
+    rest =
+#if MIN_VERSION_servant_server(0,11,0)
+        Tagged $
+#endif
+        staticApp $ embeddedSettings files
 
 swaggerUiIndexTemplate :: T.Text
 swaggerUiIndexTemplate = $(embedStringFile "index.html.tmpl")