2 files changed, 6 insertions, 4 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index ea87267c..92d626eb 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -156,7 +156,8 @@ library
                      , network      >= 2.4
                      , krpc         >= 0.6.1
                      , http-types   >= 0.8
-                     , http-conduit >= 1.9 && < 2.0
+                     , http-client  >= 0.2
+                     , http-conduit >= 2.0
                      , iproute
 
                        -- RNG/PRNG
diff --git a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs b/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
index 32a5e79c..c5bf4e31 100644
--- a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
+++ b/src/Network/BitTorrent/Tracker/RPC/HTTP.hs
@@ -43,8 +43,9 @@ import Data.Typeable
 import Network.URI
 import           Network.HTTP.Conduit hiding
                  (Manager, newManager, closeManager, withManager)
+import           Network.HTTP.Client (defaultManagerSettings)
+import           Network.HTTP.Client.Internal (setUri)
 import qualified Network.HTTP.Conduit as HTTP
-import           Network.HTTP.Conduit.Internal (setUri)
 import           Network.HTTP.Types.Header (hUserAgent)
 import           Network.HTTP.Types.URI    (SimpleQuery, renderSimpleQuery)
 
@@ -92,7 +93,7 @@ instance Default Options where
     { optAnnounceExt = def
     , optHttpProxy   = Nothing
     , optUserAgent   = BC.pack libUserAgent
-    , optHttpOptions = def
+    , optHttpOptions = defaultManagerSettings
     }
 
 -- | HTTP tracker manager.
@@ -114,7 +115,7 @@ withManager opts = bracket (newManager opts) closeManager
 --  Queries
 -----------------------------------------------------------------------}
 
-fillRequest :: Options -> SimpleQuery -> Request m -> Request m
+fillRequest :: Options -> SimpleQuery -> Request -> Request
 fillRequest Options {..} q r = r
   { queryString    = joinQuery (queryString r) (renderSimpleQuery False q)
   , requestHeaders = (hUserAgent, optUserAgent) : requestHeaders r