diff --git a/Yesod/Dispatch.hs b/Yesod/Dispatch.hs
index 3e356561..c5a1c114 100644
--- a/Yesod/Dispatch.hs
+++ b/Yesod/Dispatch.hs
@@ -21,6 +21,7 @@ import Web.Routes.Quasi
 import Language.Haskell.TH.Syntax
 
 import qualified Network.Wai as W
+import qualified Network.Wai.Enumerator as W
 import Network.Wai.Middleware.CleanPath
 import Network.Wai.Middleware.ClientSession
 import Network.Wai.Middleware.Jsonp
@@ -220,7 +221,8 @@ responseToWaiResponse (sc, hs, ct, c) = do
     let hs'' = (W.ContentType, cs $ contentTypeToString ct) : hs'
     return $ W.Response sc hs'' $ case c of
                                     ContentFile fp -> Left fp
-                                    ContentEnum e -> Right $ W.Enumerator e
+                                    ContentEnum e -> Right $ W.buffer
+                                                           $ W.Enumerator e
 
 -- | Convert Header to a key/value pair.
 headerToPair :: Header -> IO (W.ResponseHeader, B.ByteString)
diff --git a/yesod.cabal b/yesod.cabal
index 0acad74e..6ff0c69c 100644
--- a/yesod.cabal
+++ b/yesod.cabal
@@ -40,7 +40,7 @@ library
         Buildable: True
     build-depends:   base >= 4 && < 5,
                      time >= 1.1.3 && < 1.2,
-                     wai >= 0.0.0 && < 0.3,
+                     wai >= 0.0.1 && < 0.3,
                      wai-extra >= 0.0.0 && < 0.1,
                      authenticate >= 0.6 && < 0.7,
                      bytestring >= 0.9.1.4 && < 0.10,