diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index 0f835301..9f72bdf4 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -45,8 +45,8 @@ library
                    , unordered-containers
                    , yesod-form              >= 1.4       && < 1.5
                    , transformers            >= 0.2.2
-                   , persistent              >= 1.2       && < 2.1
-                   , persistent-template     >= 1.2       && < 2.1
+                   , persistent              >= 2.1       && < 2.2
+                   , persistent-template     >= 2.1       && < 2.2
                    , http-conduit            >= 1.5
                    , aeson                   >= 0.7
                    , lifted-base             >= 0.1
diff --git a/yesod-core/Yesod/Core/Dispatch.hs b/yesod-core/Yesod/Core/Dispatch.hs
index 6a68ed36..ad564525 100644
--- a/yesod-core/Yesod/Core/Dispatch.hs
+++ b/yesod-core/Yesod/Core/Dispatch.hs
@@ -96,7 +96,6 @@ toWaiAppYre yre req =
          sendResponse $ W.responseLBS status301
                 [ ("Content-Type", "text/plain")
                 , ("Location", Blaze.ByteString.Builder.toByteString dest')
-                -- FIXME , ("Server", serverValue)
                 ] "Redirecting"
       where
         dest = joinPath y (resolveApproot y env) segments' []
@@ -155,6 +154,7 @@ warp port site = do
     logger <- makeLogger site
     toWaiAppLogger logger site >>= Network.Wai.Handler.Warp.runSettings (
         Network.Wai.Handler.Warp.setPort port $
+        Network.Wai.Handler.Warp.setServerName serverValue $
         Network.Wai.Handler.Warp.setOnException (\_ e ->
                 when (shouldLog' e) $
                 messageLoggerSource
@@ -168,8 +168,8 @@ warp port site = do
   where
     shouldLog' = Network.Wai.Handler.Warp.defaultShouldDisplayException
 
-_serverValue :: S8.ByteString -- FIXME
-_serverValue = S8.pack $ concat
+serverValue :: S8.ByteString
+serverValue = S8.pack $ concat
     [ "Warp/"
     , Network.Wai.Handler.Warp.warpVersion
     , " + Yesod/"
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 9423fea8..93ef5ce6 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -60,7 +60,7 @@ library
                    , blaze-markup          >= 0.5.1
                    , data-default
                    , safe
-                   , warp                  >= 1.3.8
+                   , warp                  >= 3.0.2
                    , unix-compat
                    , conduit-extra
                    , exceptions            >= 0.6
diff --git a/yesod-persistent/yesod-persistent.cabal b/yesod-persistent/yesod-persistent.cabal
index 77a8e965..8ff8081e 100644
--- a/yesod-persistent/yesod-persistent.cabal
+++ b/yesod-persistent/yesod-persistent.cabal
@@ -15,8 +15,8 @@ description:     Some helpers for using Persistent from Yesod.
 library
     build-depends:   base                      >= 4        && < 5
                    , yesod-core                >= 1.4.0    && < 1.5
-                   , persistent                >= 2.0      && < 2.1
-                   , persistent-template       >= 2.0      && < 2.1
+                   , persistent                >= 2.1      && < 2.2
+                   , persistent-template       >= 2.1      && < 2.2
                    , transformers              >= 0.2.2
                    , blaze-builder
                    , conduit