diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+## 1.6.0
+
+* Upgrade to yesod-core 1.6
+
 ## 1.4.5
 
 * Fix warnings
diff --git a/Yesod/Default/Util.hs b/Yesod/Default/Util.hs
--- a/Yesod/Default/Util.hs
+++ b/Yesod/Default/Util.hs
@@ -18,9 +18,7 @@
 import Data.Text (Text, pack, unpack)
 import Yesod.Core -- purposely using complete import so that Haddock will see addStaticContent
 import Control.Monad (when, unless)
-import Control.Monad.Trans.Resource (runResourceT)
-import Data.Conduit (($$))
-import Data.Conduit.Binary (sourceLbs, sinkFileCautious)
+import Conduit
 import System.Directory (doesFileExist, createDirectoryIfMissing)
 import Language.Haskell.TH.Syntax
 import Text.Lucius (luciusFile, luciusFileReload)
@@ -42,12 +40,12 @@
     -> Text -- ^ filename extension
     -> Text -- ^ mime type
     -> L.ByteString -- ^ file contents
-    -> HandlerT master IO (Maybe (Either Text (Route master, [(Text, Text)])))
+    -> HandlerFor master (Maybe (Either Text (Route master, [(Text, Text)])))
 addStaticContentExternal minify hash staticDir toRoute ext' _ content = do
     liftIO $ createDirectoryIfMissing True statictmp
     exists <- liftIO $ doesFileExist fn'
-    unless exists $
-        liftIO $ runResourceT $ sourceLbs content' $$ sinkFileCautious fn'
+    unless exists $ withSinkFileCautious fn' $ \sink ->
+        runConduit $ sourceLazy content' .| sink
     return $ Just $ Right (toRoute ["tmp", pack fn], [])
   where
     fn, statictmp, fn' :: FilePath
diff --git a/yesod.cabal b/yesod.cabal
--- a/yesod.cabal
+++ b/yesod.cabal
@@ -1,5 +1,5 @@
 name:            yesod
-version:         1.4.5
+version:         1.6.0
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -18,10 +18,9 @@
         cpp-options: -DWINDOWS
 
     build-depends:   base                      >= 4.6      && < 5
-                   , yesod-core                >= 1.4      && < 1.5
-                   , yesod-persistent          >= 1.4      && < 1.5
-                   , yesod-form                >= 1.4      && < 1.5
-                   , monad-control             >= 0.3      && < 1.1
+                   , yesod-core                >= 1.6      && < 1.7
+                   , yesod-persistent          >= 1.6      && < 1.7
+                   , yesod-form                >= 1.6      && < 1.7
                    , transformers              >= 0.2.2
                    , wai                       >= 1.3
                    , wai-extra                 >= 1.3
@@ -38,8 +37,7 @@
                    , bytestring
                    , monad-logger
                    , fast-logger
-                   , conduit
-                   , conduit-extra             >= 1.1.14
+                   , conduit                   >= 1.3
                    , resourcet
                    , shakespeare
                    , streaming-commons