diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,10 @@
 
+## 0.3.1.0
+
+* Update to work with servant-0.16
+  [#10](https://github.com/cdepillabout/servant-rawm/pull/10). Thanks
+  [@vlatkoB](https://github.com/vlatkoB)!
+
 ## 0.3.0.0
 
 * Update to work with the latest version of Servant (0.14) and remove support from older versions of Servant.
diff --git a/servant-rawm.cabal b/servant-rawm.cabal
--- a/servant-rawm.cabal
+++ b/servant-rawm.cabal
@@ -1,5 +1,5 @@
 name:                servant-rawm
-version:             0.3.0.0
+version:             0.3.1.0
 synopsis:            Embed a raw 'Application' in a Servant API
 description:         Please see <https://github.com/cdepillabout/servant-rawm#readme README.md>.
 homepage:            https://github.com/cdepillabout/servant-rawm
@@ -37,12 +37,12 @@
                      , http-types >= 0.9
                      , lens >= 4.0
                      , resourcet >= 1.0
-                     , servant-client >= 0.14
-                     , servant-docs >= 0.11
-                     , servant-server >= 0.14
+                     , servant-client >= 0.16
+                     , servant-client-core >= 0.16
+                     , servant-docs >= 0.11.3
+                     , servant-server >= 0.16
                      , wai >= 3.2
                      , wai-app-static >= 3.1
-                     , servant-client-core >= 0.14
   default-language:    Haskell2010
   ghc-options:         -Wall -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates -fwarn-monomorphism-restriction -Wmissing-import-lists
 
@@ -134,7 +134,7 @@
                      , servant-rawm
                      , servant-server
                      , tasty
-                     , tasty-hspec
+                     , tasty-hspec >= 0.2
                      , tasty-hunit
                      , text
                      , transformers
diff --git a/src/Servant/RawM/Internal/Server.hs b/src/Servant/RawM/Internal/Server.hs
--- a/src/Servant/RawM/Internal/Server.hs
+++ b/src/Servant/RawM/Internal/Server.hs
@@ -33,8 +33,7 @@
         embeddedSettings, staticApp, webAppSettingsWithLookup)
 import Servant (Context, HasServer(route, hoistServerWithContext), Handler, ServerT, runHandler)
 import Servant.Server.Internal
-       (Delayed, Router'(RawRouter), RouteResult(Fail, FailFatal, Route), responseServantErr,
-        runDelayed)
+       (Delayed, Router'(RawRouter), RouteResult(Fail, FailFatal, Route), responseServerError, runDelayed)
 import System.FilePath (addTrailingPathSeparator)
 import WaiAppStatic.Storage.Filesystem (ETagLookup)
 
@@ -72,7 +71,7 @@
               (Route handlerApp) -> do
                 eitherApp <- runHandler handlerApp
                 case eitherApp of
-                  Left err -> respond . Route $ responseServantErr err
+                  Left err -> respond . Route $ responseServerError err
                   Right app -> app request (respond . Route)
   hoistServerWithContext
     :: Proxy (RawM' serverType)
diff --git a/stack.yaml b/stack.yaml
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,7 +1,9 @@
 # For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration.html
 
 # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
-resolver: lts-12.7
+# nightly is used for the servant-0.16 dependencies.  When lts-14 is released, this can be updated to
+# use that.
+resolver: nightly-2019-03-27
 
 # Local packages, usually specified by relative directory name
 packages:
@@ -39,3 +41,7 @@
 # This has been disabled because of the following exchange:
 # https://github.com/cdepillabout/pretty-simple/pull/1#issuecomment-272706215
 #pvp-bounds: both
+
+nix:
+  packages:
+    - zlib