diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+## 3.0.4
+
+* Replace `acceptSafe` with `accept`, see [#361](https://github.com/yesodweb/wai/issues/361)
+
 ## 3.0.3
 
 * Support chain certs [#349](https://github.com/yesodweb/wai/pull/349)
diff --git a/Network/Wai/Handler/WarpTLS.hs b/Network/Wai/Handler/WarpTLS.hs
--- a/Network/Wai/Handler/WarpTLS.hs
+++ b/Network/Wai/Handler/WarpTLS.hs
@@ -33,13 +33,13 @@
 import qualified Network.TLS as TLS
 import Network.Wai.Handler.Warp
 import Network.Wai (Application)
-import Network.Socket (Socket, sClose, withSocketsDo, SockAddr)
+import Network.Socket (Socket, sClose, withSocketsDo, SockAddr, accept)
 import qualified Data.ByteString as S
 import qualified Data.ByteString.Lazy as L
 import Control.Exception (bracket, finally, handle, fromException, try, IOException)
 import qualified Network.TLS.Extra as TLSExtra
 import qualified Data.ByteString as B
-import Data.Streaming.Network (bindPortTCP, acceptSafe, safeRecv)
+import Data.Streaming.Network (bindPortTCP, safeRecv)
 import Control.Applicative ((<$>))
 import qualified Data.IORef as I
 import Control.Exception (Exception, throwIO)
@@ -250,7 +250,7 @@
 
 getter :: TLS.TLSParams params => TLSSettings -> Socket -> params -> IO (IO (Connection, Transport), SockAddr)
 getter tlsset@TLSSettings{..} sock params = do
-    (s, sa) <- acceptSafe sock
+    (s, sa) <- accept sock
     return (mkConn tlsset s params, sa)
 
 mkConn :: TLS.TLSParams params => TLSSettings -> Socket -> params -> IO (Connection, Transport)
diff --git a/warp-tls.cabal b/warp-tls.cabal
--- a/warp-tls.cabal
+++ b/warp-tls.cabal
@@ -1,5 +1,5 @@
 Name:                warp-tls
-Version:             3.0.3
+Version:             3.0.4
 Synopsis:            HTTP over SSL/TLS support for Warp via the TLS package
 License:             MIT
 License-file:        LICENSE