diff --git a/library/Magicbane/App.hs b/library/Magicbane/App.hs
--- a/library/Magicbane/App.hs
+++ b/library/Magicbane/App.hs
@@ -29,16 +29,23 @@
 runMagicbaneHandler ∷ β → MagicbaneApp β α → Handler α
 runMagicbaneHandler ctx a = Handler $ ExceptT $ liftIO $ runHandler $ runReaderT (unMagicbaneApp a) ctx
 
+#if MIN_VERSION_servant_server(0,12,0)
+#else
 magicbaneToHandler ∷ β → MagicbaneApp β :~> Handler
 #if MIN_VERSION_servant_server(0,10,0)
 magicbaneToHandler ctx = NT $ runMagicbaneHandler ctx
 #else
 magicbaneToHandler ctx = Nat $ runMagicbaneHandler ctx
 #endif
+#endif
 
 -- | Constructs a WAI application from an API definition, a Servant context (used for auth mainly), the app context and the actual action handlers.
 magicbaneApp api sctx ctx actions = serveWithContext api sctx $ srv ctx
+#if MIN_VERSION_servant_server(0,12,0)
+  where srv c = hoistServer api (runMagicbaneHandler c) actions
+#else
   where srv c = enter (magicbaneToHandler c) actions
+#endif
 
 -- | Gets a value of any type from the context.
 askObj ∷ (Has β α, MonadReader α μ) ⇒ μ β
diff --git a/magicbane.cabal b/magicbane.cabal
--- a/magicbane.cabal
+++ b/magicbane.cabal
@@ -3,7 +3,7 @@
 -- see: https://github.com/sol/hpack
 
 name:           magicbane
-version:        0.1.2
+version:        0.1.3
 synopsis:       A web framework that integrates Servant, ClassyPrelude, EKG, fast-logger, wai-cli…
 
 description:    Inspired by Dropwizard, Magicbane provides a packaged framework for developing web services using the best available libraries, including Servant, ClassyPrelude, Aeson, EKG/monad-metrics, fast-logger/monad-logger, wai-cli and others.
@@ -14,7 +14,7 @@
 maintainer:     greg@unrelenting.technology
 copyright:      2017 Greg V <greg@unrelenting.technology>
 license:        PublicDomain
-tested-with:    GHC==8.0.2
+tested-with:    GHC==8.2.1
 build-type:     Simple
 cabal-version:  >= 1.10