diff --git a/Text/Hamlet.hs b/Text/Hamlet.hs
--- a/Text/Hamlet.hs
+++ b/Text/Hamlet.hs
@@ -20,13 +20,18 @@
       -- * Typeclass
     , ToHtml (..)
     , HamletValue (..)
-      -- * Construction/rendering
-    , renderHamlet
-    , renderHtml
+      -- * Construction
     , preEscapedString
     , string
     , unsafeByteString
     , cdata
+      -- * Rendering
+      -- ** ByteString
+    , renderHamlet
+    , renderHtml
+      -- ** Text
+    , renderHamletText
+    , renderHtmlText
       -- * Runtime Hamlet
     , HamletRT
     , HamletData (..)
@@ -45,13 +50,24 @@
 import Blaze.ByteString.Builder (toLazyByteString, fromByteString)
 import Blaze.ByteString.Builder.Html.Utf8 (fromHtmlEscapedString)
 import Blaze.ByteString.Builder.Char.Utf8 (fromString)
+import qualified Data.Text.Lazy as T
+import qualified Data.Text.Lazy.Encoding as T
+import qualified Data.Text.Encoding.Error as T
 
 -- | Converts a 'Hamlet' to lazy bytestring.
 renderHamlet :: (url -> [(String, String)] -> String) -> Hamlet url -> L.ByteString
 renderHamlet render h = renderHtml $ h render
 
+renderHamletText :: (url -> [(String, String)] -> String) -> Hamlet url
+                 -> T.Text
+renderHamletText render h =
+    T.decodeUtf8With T.lenientDecode $ renderHtml $ h render
+
 renderHtml :: Html -> L.ByteString
 renderHtml (Html h) = toLazyByteString h
+
+renderHtmlText :: Html -> T.Text
+renderHtmlText (Html h) = T.decodeUtf8With T.lenientDecode $ toLazyByteString h
 
 -- | Wrap an 'Html' for embedding in an XML file.
 cdata :: Html -> Html
diff --git a/Text/Hamlet/Parse.hs b/Text/Hamlet/Parse.hs
--- a/Text/Hamlet/Parse.hs
+++ b/Text/Hamlet/Parse.hs
@@ -364,6 +364,8 @@
 
 data CloseStyle = NoClose | CloseInside | CloseSeparate
 
+-- FIXME A breaking change, but move closeTag to be a record in the
+-- HamletSettings datatype. Would allow more precise XML encodings.
 closeTag :: HamletSettings -> String -> CloseStyle
 closeTag h s =
     if canBeEmpty s
diff --git a/hamlet.cabal b/hamlet.cabal
--- a/hamlet.cabal
+++ b/hamlet.cabal
@@ -1,5 +1,5 @@
 name:            hamlet
-version:         0.6.0.3
+version:         0.6.1
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>