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
@@ -29,14 +29,20 @@
 import Network.Socket
 import qualified Data.ByteString.Lazy as L
 import Data.Conduit.Binary (sourceFileRange)
+import Control.Monad.Trans.Resource (runResourceT)
 import qualified Data.Conduit as C
 import qualified Data.Conduit.List as CL
 import Control.Exception (bracket, finally, handle)
 import qualified Network.TLS.Extra as TLSExtra
 import qualified Data.ByteString as B
-import Data.Conduit.Network (bindPort)
+#if MIN_VERSION_conduit(1,1,0)
+import Data.Streaming.Network (bindPortTCP, acceptSafe)
+#else
+import Data.Conduit.Network (bindPort, acceptSafe)
+#define bindPortTCP bindPort
+#endif
 import Control.Applicative ((<$>))
-import Data.Conduit.Network (sourceSocket, sinkSocket, acceptSafe)
+import Data.Conduit.Network (sourceSocket, sinkSocket)
 import Data.Maybe (fromMaybe)
 import qualified Data.IORef as I
 import Control.Exception (Exception, throwIO)
@@ -148,7 +154,7 @@
                             , connSendAll = TLS.sendData ctx . L.fromChunks . return
                             , connSendFile = \fp offset len _th headers -> do
                                 TLS.sendData ctx $ L.fromChunks headers
-                                C.runResourceT $ sourceFileRange fp (Just offset) (Just len) C.$$ CL.mapM_ (TLS.sendData ctx . L.fromChunks . return)
+                                runResourceT $ sourceFileRange fp (Just offset) (Just len) C.$$ CL.mapM_ (TLS.sendData ctx . L.fromChunks . return)
                             , connClose =
                                 TLS.bye ctx `finally`
                                 TLS.contextClose ctx
@@ -190,7 +196,7 @@
 runTLS :: TLSSettings -> Settings -> Application -> IO ()
 runTLS tset set app = withSocketsDo $
     bracket
-        (bindPort (settingsPort set) (settingsHost set))
+        (bindPortTCP (settingsPort set) (settingsHost set))
         sClose
         (\sock -> runTLSSocket tset set sock app)
 
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:             2.0.3.1
+Version:             2.0.3.2
 Synopsis:            HTTP over SSL/TLS support for Warp via the TLS package
 License:             MIT
 License-file:        LICENSE
@@ -18,12 +18,15 @@
                    , wai                           >= 2.0      && < 2.2
                    , warp                          >= 2.0.2    && < 2.2
                    , transformers                  >= 0.2
-                   , conduit                       >= 0.5      && < 1.1
-                   , network-conduit               >= 0.6      && < 1.1
+                   , conduit                       >= 0.5      && < 1.2
+                   , conduit-extra
+                   , network-conduit               >= 0.6      && < 1.2
                    , data-default-class            >= 0.0.1
                    , tls                           >= 1.2.1
                    , network                       >= 2.2.1
                    , cprng-aes                     >= 0.5.0
+                   , streaming-commons
+                   , resourcet
   Exposed-modules:   Network.Wai.Handler.WarpTLS
   ghc-options:       -Wall