diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index e179eb99..483c9814 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -7,3 +7,4 @@ Yesod 0.10
 * Enumerators are gone, in come conduits, now you can catch exceptions!
 * Move from pool to resource-pool
 * Rework of the redirect system
+* Configure database parameters via environment variables.
diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal
index 286dc092..f94254c9 100644
--- a/yesod-default/yesod-default.cabal
+++ b/yesod-default/yesod-default.cabal
@@ -29,7 +29,7 @@ library
                    , shakespeare-css       >= 0.10.5 && < 0.11
                    , shakespeare-js        >= 0.10.4 && < 0.11
                    , template-haskell
-                   , yaml                  >= 0.5.1.1  && < 0.6
+                   , yaml                  >= 0.5.1.2  && < 0.6
                    , unordered-containers
 
     if !os(windows)
diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg
index 6f6f5a25..896d12c8 100644
--- a/yesod/scaffold/Application.hs.cg
+++ b/yesod/scaffold/Application.hs.cg
@@ -20,7 +20,7 @@ import Yesod.Logger (Logger, logBS, toProduction)
 import Network.Wai.Middleware.RequestLogger (logHandle)
 #endif
 import qualified Database.Persist.Store~importMigration~
-import Network.HTTP.Conduit (newManagerIO)
+import Network.HTTP.Conduit (newManager, def)
 
 -- Import all relevant handler modules here.
 import Handler.Root
@@ -36,10 +36,11 @@ mkYesodDispatch "~sitearg~" resources~sitearg~
 -- migrations handled by Yesod.
 getApplication :: AppConfig DefaultEnv Extra -> Logger -> IO Application
 getApplication conf logger = do
-    manager <- newManagerIO 10
+    manager <- newManager def
     s <- staticSite
     dbconf <- withYamlEnvironment "config/~dbConfigFile~.yml" (appEnv conf)
-              Database.Persist.Store.loadConfig
+              Database.Persist.Store.loadConfig >>=
+              Database.Persist.Store.applyEnv
     p <- Database.Persist.Store.createPoolConfig (dbconf :: Settings.PersistConfig)~runMigration~
     let foundation = ~sitearg~ conf setLogger s p manager
     app <- toWaiAppPlain foundation
diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg
index 282d253c..065f35a0 100644
--- a/yesod/scaffold/project.cabal.cg
+++ b/yesod/scaffold/project.cabal.cg
@@ -95,5 +95,5 @@ executable         ~project~
                  , monad-control                 >= 0.3        && < 0.4
                  , wai-extra                     >= 1.0        && < 1.1
                  , yaml                          >= 0.5        && < 0.6
-                 , http-conduit                  >= 1.1        && < 1.2
+                 , http-conduit                  >= 1.2        && < 1.3