diff --git a/Mighty.hs b/Mighty.hs
--- a/Mighty.hs
+++ b/Mighty.hs
@@ -10,7 +10,7 @@
 import FileCGIApp
 import FileCache
 import Network
-import qualified Network.HTTP.Enumerator as H
+import qualified Network.HTTP.Conduit as H
 import Network.Wai.Application.Classic
 import Network.Wai.Handler.Warp
 import Network.Wai.Logger.Prefork
@@ -84,9 +84,12 @@
     ignoreSigChild
     lgr <- logInit FromSocket logtype
     getInfo <- fileCacheInit
-    mgr <- H.newManager
-    runSettingsSocket setting s $
-        fileCgiApp (cspec lgr) (filespec getInfo) (revproxyspec mgr) route
+    mgr <- H.newManager H.def {
+            -- FIXME
+            H.managerConnCount = 1024
+          }
+    runSettingsSocket setting s $ \req ->
+        fileCgiApp (cspec lgr) (filespec getInfo) (revproxyspec mgr) route req
   where
     setting = defaultSettings {
         settingsPort        = opt_port opt
diff --git a/mighttpd2.cabal b/mighttpd2.cabal
--- a/mighttpd2.cabal
+++ b/mighttpd2.cabal
@@ -1,5 +1,5 @@
 Name:                   mighttpd2
-Version:                2.4.2
+Version:                2.5.0
 Author:                 Kazu Yamamoto <kazu@iij.ad.jp>
 Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp>
 License:                BSD3
@@ -22,7 +22,7 @@
                         wai-app-file-cgi, wai, transformers, http-types,
                         directory, filepath,
                         http-date, hashmap, deepseq, wai-logger-prefork,
-                        http-enumerator
+                        http-conduit
   Other-Modules:	Config
                         Config.Internal
                         FileCGIApp