diff --git a/HTTP.cabal b/HTTP.cabal
--- a/HTTP.cabal
+++ b/HTTP.cabal
@@ -1,5 +1,5 @@
 Name: HTTP
-Version: 4000.2.14
+Version: 4000.2.15
 Cabal-Version: >= 1.8
 Build-type: Simple
 License: BSD3
@@ -60,6 +60,10 @@
   description: Use version 2.3.x or below of the network package
   default: False
 
+Flag conduit10
+  description: Use version 1.0.x or below of the conduit package (for the test suite)
+  default: False
+
 Library
   Exposed-modules: 
                  Network.BufferType,
@@ -92,7 +96,7 @@
     Build-depends: mtl >= 1.1.0.0 && < 1.2
     CPP-Options: -DMTL1
   else
-    Build-depends: mtl >= 2.0 && < 2.2
+    Build-depends: mtl >= 2.0 && < 2.3
 
   build-tools: ghc >= 6.10 && < 7.10
 
@@ -116,12 +120,11 @@
   build-depends:     HTTP,
                      HUnit,
                      httpd-shed,
-                     mtl >= 2.0 && < 2.2,
+                     mtl >= 2.0 && < 2.3,
                      bytestring >= 0.9 && < 0.11,
-                     case-insensitive >= 0.4 && < 1.2,
+                     case-insensitive >= 0.4 && < 1.3,
                      deepseq >= 1.3 && < 1.4,
                      http-types >= 0.6 && < 0.9,
-                     conduit >= 0.4 && < 1.1,
                      wai >= 1.2 && < 2.2,
                      warp >= 1.2 && < 2.2,
                      pureMD5 >= 2.1 && < 2.2,
@@ -130,4 +133,13 @@
                      split >= 0.1 && < 0.3,
                      test-framework,
                      test-framework-hunit
+
+  if flag(conduit10)
+    build-depends:
+                       conduit >= 0.4 && < 1.1
+  else
+    build-depends:
+                       conduit >= 1.1 && < 1.2,
+                       conduit-extra >= 1.1 && < 1.2
+