diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -1,6 +1,7 @@
-# v1.3.2 ()
+# v1.3.2 (2016/09/21)
 
-* Add stdlib `validate_integer` 
+* Add stdlib `validate_integer`
+* Support for servant 0.9
 
 # v1.3.1 (2016/08/31)
 
diff --git a/PuppetDB/Remote.hs b/PuppetDB/Remote.hs
--- a/PuppetDB/Remote.hs
+++ b/PuppetDB/Remote.hs
@@ -38,15 +38,15 @@
         (q1 sgetResources)
         (q1 sgetNodes)
         (throwError "operation not supported")
-        (\ndename q -> prettyError $ sgetNodeResources ndename (Just q) mgr url)
+        (\ndename q -> prettyError $ sgetNodeResources ndename (Just q))
         where
-            sgetNodes :: Maybe (Query NodeField) -> Manager -> BaseUrl -> ClientM [NodeInfo]
-            sgetNodeResources :: Text -> Maybe (Query ResourceField) -> Manager -> BaseUrl -> ClientM [Resource]
-            sgetFacts :: Maybe (Query FactField) -> Manager -> BaseUrl -> ClientM [FactInfo]
-            sgetResources :: Maybe (Query ResourceField) -> Manager -> BaseUrl -> ClientM [Resource]
+            sgetNodes :: Maybe (Query NodeField) -> ClientM [NodeInfo]
+            sgetNodeResources :: Text -> Maybe (Query ResourceField) -> ClientM [Resource]
+            sgetFacts :: Maybe (Query FactField) -> ClientM [FactInfo]
+            sgetResources :: Maybe (Query ResourceField) -> ClientM [Resource]
             (sgetNodes :<|> sgetNodeResources :<|> sgetFacts :<|> sgetResources) = client api
 
-            prettyError :: ExceptT ServantError IO b -> ExceptT PrettyError IO b
-            prettyError = mapExceptT (fmap (_Left %~ PrettyError . string. show))
-            q1 :: (Maybe a -> Manager -> BaseUrl -> ClientM b) -> a -> ExceptT PrettyError IO b
-            q1 f a = prettyError (f (Just a) mgr url)
+            prettyError :: ClientM b -> ExceptT PrettyError IO b
+            prettyError = ExceptT . fmap (_Left %~ PrettyError . string. show) . flip runClientM (ClientEnv mgr url)
+            q1 :: (Maybe a -> ClientM b) -> a -> ExceptT PrettyError IO b
+            q1 f a = prettyError (f (Just a))
diff --git a/README.adoc b/README.adoc
--- a/README.adoc
+++ b/README.adoc
@@ -1,6 +1,7 @@
 = Language-puppet
 
 image:https://img.shields.io/hackage/v/language-puppet.svg[link="http://hackage.haskell.org/package/language-puppet"]
+image:https://www.stackage.org/package/language-puppet/badge/lts[link="https://www.stackage.org/lts/package/language-puppet"]
 image:https://www.stackage.org/package/language-puppet/badge/nightly[link="https://www.stackage.org/nightly/package/language-puppet"]
 image:https://travis-ci.org/bartavelle/language-puppet.svg?branch=master["Build Status", link="https://travis-ci.org/bartavelle/language-puppet"]
 
diff --git a/language-puppet.cabal b/language-puppet.cabal
--- a/language-puppet.cabal
+++ b/language-puppet.cabal
@@ -2,7 +2,7 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                language-puppet
-version:             1.3.1.1
+version:             1.3.2
 synopsis:            Tools to parse and evaluate the Puppet DSL.
 description:         This is a set of tools that is supposed to fill all your Puppet needs : syntax checks, catalog compilation, PuppetDB queries, simulationg of complex interactions between nodes, Puppet master replacement, and more !
 homepage:            http://lpuppet.banquise.net/
@@ -115,8 +115,8 @@
                      , regex-pcre-builtin   >= 0.94.4
                      , scientific           >= 0.2   && < 0.4
                      , semigroups
-                     , servant              == 0.8.*
-                     , servant-client       == 0.8.*
+                     , servant              == 0.9.*
+                     , servant-client       == 0.9.*
                      , split                == 0.2.*
                      , stm                  == 2.4.*
                      , strict-base-types    >= 0.3