diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -0,0 +1,3 @@
+## 1.6.0
+
+* Upgrade to yesod-core 1.6.0
diff --git a/Yesod/Sitemap.hs b/Yesod/Sitemap.hs
--- a/Yesod/Sitemap.hs
+++ b/Yesod/Sitemap.hs
@@ -74,19 +74,19 @@
 -- | Serve a stream of @SitemapUrl@s as a sitemap.
 --
 -- Since 1.2.0
-sitemap :: Source (HandlerT site IO) (SitemapUrl (Route site))
-        -> HandlerT site IO TypedContent
+sitemap :: ConduitT () (SitemapUrl (Route site)) (HandlerFor site) ()
+        -> HandlerFor site TypedContent
 sitemap urls = do
     render <- getUrlRender
     respondSource typeXml $ do
         yield Flush
-        urls $= sitemapConduit render $= renderBuilder def $= CL.map Chunk
+        urls .| sitemapConduit render .| renderBuilder def .| CL.map Chunk
 
 -- | Convenience wrapper for @sitemap@ for the case when the input is an
 -- in-memory list.
 --
 -- Since 1.2.0
-sitemapList :: [SitemapUrl (Route site)] -> HandlerT site IO TypedContent
+sitemapList :: [SitemapUrl (Route site)] -> HandlerFor site TypedContent
 sitemapList = sitemap . mapM_ yield
 
 -- | Convert a stream of @SitemapUrl@s to XML @Event@s using the given URL
@@ -97,7 +97,7 @@
 -- Since 1.2.0
 sitemapConduit :: Monad m
                => (a -> Text)
-               -> Conduit (SitemapUrl a) m Event
+               -> ConduitT (SitemapUrl a) Event m ()
 sitemapConduit render = do
     yield EventBeginDocument
     element "urlset" [] $ awaitForever goUrl
diff --git a/yesod-sitemap.cabal b/yesod-sitemap.cabal
--- a/yesod-sitemap.cabal
+++ b/yesod-sitemap.cabal
@@ -1,5 +1,5 @@
 name:            yesod-sitemap
-version:         1.4.0.1
+version:         1.6.0
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -15,7 +15,7 @@
 
 library
     build-depends:   base                      >= 4        && < 5
-                   , yesod-core                >= 1.4      && < 1.5
+                   , yesod-core                >= 1.6      && < 1.7
                    , time                      >= 1.1.4
                    , xml-conduit               >= 1.0
                    , text