diff --git a/debian/control b/debian/control
index 522b7c5cce..7defd8a7c0 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,11 @@ Build-Depends:
 	libghc-cryptohash-dev,
 	libghc-dataenc-dev,
 	libghc-utf8-string-dev,
-	libghc-hs3-dev (>= 0.5.6),
+	libghc-aws-dev,
+	libghc-conduit-dev,
+	libghc-resourcet-dev,
+	libghc-http-conduit-dev,
+	libghc-http-client-dev,
 	libghc-dav-dev (>= 1.0) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc],
 	libghc-quickcheck2-dev,
 	libghc-monad-control-dev (>= 0.3),
diff --git a/git-annex.cabal b/git-annex.cabal
index 70bd9c88b1..b05863b797 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -137,12 +137,12 @@ Executable git-annex
     CPP-Options: -DWITH_CRYPTOHASH
 
   if flag(S3)
-    Build-Depends: hS3, http-conduit, http-client, resourcet, http-types, aws
+    Build-Depends: aws, conduit, resourcet,
+     http-conduit, http-client, http-types
     CPP-Options: -DWITH_S3
 
   if flag(WebDAV)
-    Build-Depends: DAV (>= 1.0),
-     http-client, http-types
+    Build-Depends: DAV (>= 1.0), http-client, http-types
     CPP-Options: -DWITH_WEBDAV
 
   if flag(Assistant) && ! os(solaris)