diff --git a/Network/Wai/Application/Classic/Conduit.hs b/Network/Wai/Application/Classic/Conduit.hs
--- a/Network/Wai/Application/Classic/Conduit.hs
+++ b/Network/Wai/Application/Classic/Conduit.hs
@@ -6,11 +6,11 @@
   , parseHeader
   ) where
 
-import Blaze.ByteString.Builder (Builder)
-import qualified Blaze.ByteString.Builder as BB (fromByteString)
 import Control.Applicative
 import Data.Attoparsec.ByteString
 import Data.ByteString (ByteString)
+import Data.ByteString.Builder (Builder)
+import qualified Data.ByteString.Builder as BB (byteString)
 import Data.CaseInsensitive (CI(..), mk)
 import Data.Conduit
 import Data.Conduit.Attoparsec
@@ -21,7 +21,7 @@
 ----------------------------------------------------------------
 
 byteStringToBuilder :: ByteString -> Builder
-byteStringToBuilder = BB.fromByteString
+byteStringToBuilder = BB.byteString
 
 ----------------------------------------------------------------
 
@@ -41,7 +41,7 @@
 
 ----------------------------------------------------------------
 
-parseHeader :: Sink ByteString IO RequestHeaders
+parseHeader :: ConduitM ByteString o IO RequestHeaders
 parseHeader = sinkParser parseHeader'
 
 parseHeader' :: Parser RequestHeaders
diff --git a/Network/Wai/Application/Classic/EventSource.hs b/Network/Wai/Application/Classic/EventSource.hs
--- a/Network/Wai/Application/Classic/EventSource.hs
+++ b/Network/Wai/Application/Classic/EventSource.hs
@@ -4,9 +4,9 @@
     bodyToEventSource
   ) where
 
-import Blaze.ByteString.Builder
 import Data.ByteString (ByteString)
 import qualified Data.ByteString as BS
+import Data.ByteString.Builder
 import Data.ByteString.Char8 ()
 import Data.Conduit
 import qualified Data.Conduit.List as CL
@@ -55,7 +55,7 @@
   where
     f input rest = (last xs, concatMap addFlush $ init xs)
       where
-        addFlush x = [Chunk (fromByteString x), Flush]
+        addFlush x = [Chunk (byteString x), Flush]
         xs = splitDoubleLineBreak (rest `BS.append` input)
 
 -- insert Flush if exists a double line-break
diff --git a/Network/Wai/Application/Classic/RevProxy.hs b/Network/Wai/Application/Classic/RevProxy.hs
--- a/Network/Wai/Application/Classic/RevProxy.hs
+++ b/Network/Wai/Application/Classic/RevProxy.hs
@@ -3,7 +3,6 @@
 
 module Network.Wai.Application.Classic.RevProxy (revProxyApp) where
 
-import Blaze.ByteString.Builder (Builder)
 #if __GLASGOW_HASKELL__ < 709
 import Control.Applicative
 #endif
@@ -11,6 +10,7 @@
 import Control.Monad.IO.Class (liftIO)
 import Data.ByteString (ByteString)
 import qualified Data.ByteString as BS (uncons)
+import Data.ByteString.Builder (Builder)
 import qualified Data.ByteString.Char8 as BS hiding (uncons)
 import Data.Conduit
 import qualified Network.HTTP.Client as H
diff --git a/wai-app-file-cgi.cabal b/wai-app-file-cgi.cabal
--- a/wai-app-file-cgi.cabal
+++ b/wai-app-file-cgi.cabal
@@ -1,5 +1,5 @@
 Name:                   wai-app-file-cgi
-Version:                3.1.4
+Version:                3.1.6
 Author:                 Kazu Yamamoto <kazu@iij.ad.jp>
 Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp>
 License:                BSD3
@@ -42,8 +42,6 @@
                       , array
                       , attoparsec >= 0.10.0.0
                       , attoparsec-conduit
-                      , blaze-builder
-                      , blaze-html
                       , bytestring
                       , case-insensitive
                       , conduit >= 1.1
@@ -68,7 +66,7 @@
                       , unix
                       , wai >= 3.2 && < 3.3
                       , wai-conduit
-                      , warp >= 3.2.6 && < 3.3
+                      , warp >= 3.2.21 && < 3.3
                       , word8
 
 Test-Suite doctest