diff --git a/yesod-core/Yesod/Config.hs b/yesod-core/Yesod/Config.hs
index 9a10315f..dcd2902e 100644
--- a/yesod-core/Yesod/Config.hs
+++ b/yesod-core/Yesod/Config.hs
@@ -30,8 +30,7 @@ data AppConfig e = AppConfig
 
 -- | Information required to connect to a postgres database
 data PostgresConf = PostgresConf
-    { pgConnStr  :: String
-    , pgDatabase :: String
+    { pgConnStr  :: Text
     , pgPoolSize :: Int
     }
 
@@ -126,11 +125,11 @@ loadPostgresql env = withYamlEnvironment "config/postgresql.yml" env $ \e -> do
     -- TODO: default host/port?
     connparts <- forM ["user", "password", "host", "port"] $ \k -> do
         v <- lookupScalar k e
-        return $ k ++ "=" ++ v
+        return $ k ++ "=" ++ v ++ " "
 
     conn <- return $ concat connparts
 
-    return $ PostgresConf conn db pool
+    return $ PostgresConf (T.pack $ conn ++ " dbname=" ++ db) pool
 
 -- | Load a @'SqliteConf'@ from @config\/sqlite.yml@.
 --
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 1007919a..12d2e97b 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -38,7 +38,6 @@ library
                    , shakespeare               >= 0.10     && < 0.11
                    , shakespeare-js            >= 0.10     && < 0.11
                    , shakespeare-css           >= 0.10     && < 0.11
-                   , shakespeare-text          >= 0.10     && < 0.11
                    , blaze-builder             >= 0.2.1    && < 0.4
                    , transformers              >= 0.2      && < 0.3
                    , clientsession             >= 0.7.2    && < 0.8