diff -Nru haskell-wai-3.0.4.0/ChangeLog.md haskell-wai-3.0.5.0/ChangeLog.md
--- haskell-wai-3.0.4.0/ChangeLog.md	2015-09-29 02:12:45.000000000 +0000
+++ haskell-wai-3.0.5.0/ChangeLog.md	2015-12-07 09:08:37.000000000 +0000
@@ -1,3 +1,7 @@
+## 3.0.5.0
+
+* Avoid using the IsString Builder instance
+
 ## 3.0.4.0
 
 * A new module Network.Wai.HTTP2 is exported.
diff -Nru haskell-wai-3.0.4.0/debian/changelog haskell-wai-3.0.5.0/debian/changelog
--- haskell-wai-3.0.4.0/debian/changelog	2015-12-04 05:28:04.000000000 +0000
+++ haskell-wai-3.0.5.0/debian/changelog	2016-01-11 04:18:46.000000000 +0000
@@ -1,3 +1,9 @@
+haskell-wai (3.0.5.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint@debian.org>  Sun, 10 Jan 2016 23:18:46 -0500
+
 haskell-wai (3.0.4.0-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru haskell-wai-3.0.4.0/debian/patches/no-bytestring-builder haskell-wai-3.0.5.0/debian/patches/no-bytestring-builder
--- haskell-wai-3.0.4.0/debian/patches/no-bytestring-builder	2015-12-04 20:52:32.000000000 +0000
+++ haskell-wai-3.0.5.0/debian/patches/no-bytestring-builder	2016-01-11 04:20:02.000000000 +0000
@@ -4,7 +4,7 @@
  
  Library
    Build-Depends:     base                      >= 4        && < 5
--                   , bytestring                >= 0.9.1.4
+-                   , bytestring                >= 0.10
 -                   , bytestring-builder        >= 0.10.4.0 && < 0.10.7
 +                   , bytestring                >= 0.10.4
                     , blaze-builder             >= 0.2.1.4  && < 0.5
diff -Nru haskell-wai-3.0.4.0/Network/Wai/HTTP2.hs haskell-wai-3.0.5.0/Network/Wai/HTTP2.hs
--- haskell-wai-3.0.4.0/Network/Wai/HTTP2.hs	2015-09-29 02:12:45.000000000 +0000
+++ haskell-wai-3.0.5.0/Network/Wai/HTTP2.hs	2015-12-07 09:08:37.000000000 +0000
@@ -54,6 +54,7 @@
     ) where
 
 import           Blaze.ByteString.Builder (Builder)
+import           Blaze.ByteString.Builder.ByteString (fromByteString)
 import           Control.Exception (Exception, throwIO)
 import           Control.Monad.Trans.Cont (ContT(..))
 import           Data.ByteString (ByteString)
@@ -186,7 +187,7 @@
 -- | Respond with a minimal 404 page with the given headers.
 respondNotFound :: H.ResponseHeaders -> Responder
 respondNotFound h = Responder $ \k -> k H.notFound404 h' $
-    streamBuilder "File not found."
+    streamBuilder $ fromByteString "File not found."
   where
     contentType = (H.hContentType, "text/plain; charset=utf-8")
     h' = contentType:filter ((/=H.hContentType) . fst) h
diff -Nru haskell-wai-3.0.4.0/wai.cabal haskell-wai-3.0.5.0/wai.cabal
--- haskell-wai-3.0.4.0/wai.cabal	2015-09-29 02:12:45.000000000 +0000
+++ haskell-wai-3.0.5.0/wai.cabal	2015-12-07 09:08:37.000000000 +0000
@@ -1,5 +1,5 @@
 Name:                wai
-Version:             3.0.4.0
+Version:             3.0.5.0
 Synopsis:            Web Application Interface.
 Description:         Provides a common protocol for communication between web applications and web servers.
 description:         API docs and the README are available at <http://www.stackage.org/package/wai>.
@@ -20,7 +20,7 @@
 
 Library
   Build-Depends:     base                      >= 4        && < 5
-                   , bytestring                >= 0.9.1.4
+                   , bytestring                >= 0.10
                    , bytestring-builder        >= 0.10.4.0 && < 0.10.7
                    , blaze-builder             >= 0.2.1.4  && < 0.5
                    , network                   >= 2.2.1.5