diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+## 3.2.18.2
+
+* Replace dependency on `blaze-builder` with `bsb-http-chunked`
+
 ## 3.2.18.1
 
 * Fix benchmark compilation [#681](https://github.com/yesodweb/wai/issues/681)
diff --git a/Network/Wai/Handler/Warp/MultiMap.hs b/Network/Wai/Handler/Warp/MultiMap.hs
--- a/Network/Wai/Handler/Warp/MultiMap.hs
+++ b/Network/Wai/Handler/Warp/MultiMap.hs
@@ -15,6 +15,7 @@
 import qualified Data.IntMap.Strict as I
 import qualified Data.List.NonEmpty as NE
 import Data.Semigroup
+import Prelude -- Silence redundant import warnings
 
 import Network.Wai.Handler.Warp.Imports hiding ((<>), union, empty, insert)
 
diff --git a/Network/Wai/Handler/Warp/Response.hs b/Network/Wai/Handler/Warp/Response.hs
--- a/Network/Wai/Handler/Warp/Response.hs
+++ b/Network/Wai/Handler/Warp/Response.hs
@@ -13,7 +13,7 @@
   , addServer -- testing
   ) where
 
-import Blaze.ByteString.Builder.HTTP (chunkedTransferEncoding, chunkedTransferTerminator)
+import Data.ByteString.Builder.HTTP.Chunked (chunkedTransferEncoding, chunkedTransferTerminator)
 import qualified Control.Exception as E
 import Data.Array ((!))
 import qualified Data.ByteString as S
diff --git a/warp.cabal b/warp.cabal
--- a/warp.cabal
+++ b/warp.cabal
@@ -1,5 +1,5 @@
 Name:                warp
-Version:             3.2.18.1
+Version:             3.2.18.2
 Synopsis:            A fast, light-weight web server for WAI applications.
 License:             MIT
 License-file:        LICENSE
@@ -37,7 +37,7 @@
                    , array
                    , async
                    , auto-update               >= 0.1.3    && < 0.2
-                   , blaze-builder             >= 0.4
+                   , bsb-http-chunked                         < 0.1
                    , bytestring                >= 0.9.1.4
                    , case-insensitive          >= 0.2
                    , containers
@@ -181,7 +181,7 @@
     Build-Depends:   base >= 4.8 && < 5
                    , array
                    , auto-update
-                   , blaze-builder             >= 0.4
+                   , bsb-http-chunked                         < 0.1
                    , bytestring                >= 0.9.1.4
                    , case-insensitive          >= 0.2
                    , ghc-prim
@@ -211,6 +211,7 @@
                    , word8
                    , hashable
                    , http-date
+    -- Build-Tool-Depends: hspec-discover:hspec-discover
   if impl(ghc < 8)
       Build-Depends: semigroups