diff --git a/Network/Wai.hs b/Network/Wai.hs
--- a/Network/Wai.hs
+++ b/Network/Wai.hs
@@ -127,7 +127,7 @@
 data Response
     = ResponseFile H.Status H.ResponseHeaders FilePath (Maybe FilePart)
     | ResponseBuilder H.Status H.ResponseHeaders Builder
-    | ResponseSource H.Status H.ResponseHeaders (C.Source IO Builder)
+    | ResponseSource H.Status H.ResponseHeaders (C.Source IO (C.Flush Builder))
   deriving Typeable
 
 data FilePart = FilePart
@@ -135,14 +135,14 @@
     , filePartByteCount :: Integer
     } deriving Show
 
-responseSource :: Response -> (H.Status, H.ResponseHeaders, C.Source IO Builder) -- FIXME re-analyze usage of Builder
+responseSource :: Response -> (H.Status, H.ResponseHeaders, C.Source IO (C.Flush Builder))
 responseSource (ResponseSource s h b) = (s, h, b)
 responseSource (ResponseFile s h fp (Just part)) =
-    (s, h, sourceFilePart part fp C.$= CL.map fromByteString)
+    (s, h, sourceFilePart part fp C.$= CL.map (C.Chunk . fromByteString))
 responseSource (ResponseFile s h fp Nothing) =
-    (s, h, CB.sourceFile fp C.$= CL.map fromByteString)
+    (s, h, CB.sourceFile fp C.$= CL.map (C.Chunk . fromByteString))
 responseSource (ResponseBuilder s h b) =
-    (s, h, CL.sourceList [b])
+    (s, h, CL.sourceList [C.Chunk b])
 
 sourceFilePart :: FilePart -> FilePath -> C.Source IO B.ByteString
 sourceFilePart (FilePart offset count) fp =
diff --git a/wai.cabal b/wai.cabal
--- a/wai.cabal
+++ b/wai.cabal
@@ -1,5 +1,5 @@
 Name:                wai
-Version:             1.0.0
+Version:             1.1.0
 Synopsis:            Web Application Interface.
 Description:         Provides a common protocol for communication between web applications and web servers.
 License:             BSD3
@@ -20,7 +20,7 @@
   Build-Depends:     base                      >= 4        && < 5
                    , bytestring                >= 0.9.1.4  && < 0.10
                    , blaze-builder             >= 0.2.1.4  && < 0.4
-                   , conduit                   >= 0.1
+                   , conduit                   >= 0.2
                    , network                   >= 2.2.1.5  && < 2.4
                    , http-types                >= 0.6      && < 0.7
                    , text                      >= 0.7      && < 0.12