diff --git a/sources.txt b/sources.txt
index 20fc55d6..3830938b 100644
--- a/sources.txt
+++ b/sources.txt
@@ -10,4 +10,3 @@
 ./yesod-default
 ./yesod-test
 ./yesod
-./yesod-test
diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal
index edfbeb72..b210eeee 100644
--- a/yesod-auth/yesod-auth.cabal
+++ b/yesod-auth/yesod-auth.cabal
@@ -14,7 +14,7 @@ description:     Authentication for Yesod.
 
 flag blaze_html_0_5
     description: use blaze-html 0.5 and blaze-markup 0.5
-    default: False
+    default: True
 
 library
     build-depends:   base                    >= 4         && < 5
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index ca6b6caf..0a2a3b83 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -42,7 +42,7 @@ flag test
 
 flag blaze_html_0_5
     description: use blaze-html 0.5 and blaze-markup 0.5
-    default: False
+    default: True
 
 library
     -- Work around a bug in cabal. Without this, wai-test doesn't get built and
diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs
index dd9e2dd7..ea88858c 100644
--- a/yesod-form/Yesod/Form/Fields.hs
+++ b/yesod-form/Yesod/Form/Fields.hs
@@ -74,7 +74,11 @@ import Blaze.ByteString.Builder (writeByteString, toLazyByteString)
 import Blaze.ByteString.Builder.Internal.Write (fromWriteList)
 import Database.Persist.Store (PersistEntityBackend)
 
+#if MIN_VERSION_blaze_html(0, 5, 0)
+import Text.Blaze.Html.Renderer.String (renderHtml)
+#else
 import Text.Blaze.Renderer.String (renderHtml)
+#endif
 import qualified Data.ByteString as S
 import qualified Data.ByteString.Lazy as L
 import Data.Text (Text, unpack, pack)
diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal
index 404d24cf..3e08b786 100644
--- a/yesod-form/yesod-form.cabal
+++ b/yesod-form/yesod-form.cabal
@@ -14,7 +14,7 @@ description:     Form handling support for Yesod Web Framework
 
 flag blaze_html_0_5
     description: use blaze-html 0.5 and blaze-markup 0.5
-    default: False
+    default: True
 
 library
     build-depends:   base                  >= 4        && < 5
diff --git a/yesod-newsfeed/yesod-newsfeed.cabal b/yesod-newsfeed/yesod-newsfeed.cabal
index 85d344fb..07b9824e 100644
--- a/yesod-newsfeed/yesod-newsfeed.cabal
+++ b/yesod-newsfeed/yesod-newsfeed.cabal
@@ -14,7 +14,7 @@ description:     Helper functions and data types for producing News feeds.
 
 flag blaze_html_0_5
     description: use blaze-html 0.5 and blaze-markup 0.5
-    default: False
+    default: True
 
 library
     build-depends:   base                 >= 4        && < 5
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index ae787ef9..0109d689 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -64,7 +64,7 @@ extra-source-files:
 
 flag blaze_html_0_5
     description: use blaze-html 0.5 and blaze-markup 0.5
-    default: False
+    default: True
 
 library
     build-depends:   base                      >= 4.3      && < 5