diff --git a/Setup.hs b/Setup.hs
deleted file mode 100644
--- a/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/Setup.lhs b/Setup.lhs
new file mode 100644
--- /dev/null
+++ b/Setup.lhs
@@ -0,0 +1,7 @@
+#!/usr/bin/env runhaskell
+
+> module Main where
+> import Distribution.Simple
+
+> main :: IO ()
+> main = defaultMain
diff --git a/Yesod/AtomFeed.hs b/Yesod/AtomFeed.hs
--- a/Yesod/AtomFeed.hs
+++ b/Yesod/AtomFeed.hs
@@ -26,7 +26,7 @@
 import Yesod.Handler
 import Yesod.Widget
 import Yesod.FeedTypes
-import Text.Hamlet (Hamlet, xhamlet, hamlet, cdata)
+import Text.Hamlet (HtmlUrl, xhamlet, hamlet)
 import qualified Data.ByteString.Char8 as S8
 import Control.Monad (liftM)
 
@@ -37,7 +37,7 @@
 atomFeed :: Monad mo => Feed (Route master) -> GGHandler sub master mo RepAtom
 atomFeed = liftM RepAtom . hamletToContent . template
 
-template :: Feed url -> Hamlet url
+template :: Feed url -> HtmlUrl url
 template arg =
 #if __GLASGOW_HASKELL__ >= 700
                 [xhamlet|
@@ -55,7 +55,7 @@
         ^{entryTemplate entry}
 |]
 
-entryTemplate :: FeedEntry url -> Hamlet url
+entryTemplate :: FeedEntry url -> HtmlUrl url
 entryTemplate arg =
 #if __GLASGOW_HASKELL__ >= 700
                 [xhamlet|
@@ -67,7 +67,10 @@
     <link href=@{feedEntryLink arg}
     <updated>#{formatW3 $ feedEntryUpdated arg}
     <title>#{feedEntryTitle arg}
-    <content type=html>#{cdata $ feedEntryContent arg}
+    <content type=html>
+        \<![CDATA[
+        \#{feedEntryContent arg}
+        ]]>
 |]
 
 -- | Generates a link tag in the head of a widget.
diff --git a/Yesod/RssFeed.hs b/Yesod/RssFeed.hs
--- a/Yesod/RssFeed.hs
+++ b/Yesod/RssFeed.hs
@@ -22,7 +22,7 @@
 import Yesod.Content
 import Yesod.Widget
 import Yesod.FeedTypes
-import Text.Hamlet (Hamlet, xhamlet, hamlet)
+import Text.Hamlet (HtmlUrl, xhamlet, hamlet)
 import qualified Data.ByteString.Char8 as S8
 import Control.Monad (liftM)
 
@@ -34,7 +34,7 @@
 rssFeed :: Monad mo => Feed (Route master) -> GGHandler sub master mo RepRss
 rssFeed = liftM RepRss . hamletToContent . template
 
-template :: Feed url -> Hamlet url
+template :: Feed url -> HtmlUrl url
 template arg = 
 #if __GLASGOW_HASKELL__ >= 700
     [xhamlet|
@@ -55,7 +55,7 @@
                 ^{entryTemplate entry}
     |]
 
-entryTemplate :: FeedEntry url -> Hamlet url
+entryTemplate :: FeedEntry url -> HtmlUrl url
 entryTemplate arg = 
 #if __GLASGOW_HASKELL__ >= 700
     [xhamlet|
diff --git a/yesod-newsfeed.cabal b/yesod-newsfeed.cabal
--- a/yesod-newsfeed.cabal
+++ b/yesod-newsfeed.cabal
@@ -1,5 +1,5 @@
 name:            yesod-newsfeed
-version:         0.2.0
+version:         0.3.1
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman, Patrick Brisbin
@@ -9,13 +9,14 @@
 stability:       Stable
 cabal-version:   >= 1.6
 build-type:      Simple
-homepage:        http://docs.yesodweb.com/
+homepage:        http://www.yesodweb.com/
+description:     Helper functions and data types for producing News feeds.
 
 library
     build-depends:   base                      >= 4        && < 5
-                   , yesod-core                >= 0.8      && < 0.9
+                   , yesod-core                >= 0.9      && < 0.10
                    , time                      >= 1.1.4    && < 1.3
-                   , hamlet                    >= 0.8      && < 0.9
+                   , hamlet                    >= 0.10     && < 0.11
                    , bytestring                >= 0.9      && < 0.10
                    , text                      >= 0.9      && < 1.0
     exposed-modules: Yesod.AtomFeed
@@ -26,4 +27,4 @@
 
 source-repository head
   type:     git
-  location: git://github.com/snoyberg/yesod-newsfeed.git
+  location: git://github.com/yesodweb/yesod.git