diff --git a/.gitmodules b/.gitmodules
index a9aec3b0..1afb9379 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,4 +6,13 @@
 	url = https://github.com/yesodweb/authenticate.git
 [submodule "http-conduit"]
 	path = http-conduit
-	url = https://github.com/snoyberg/http-conduit.git
+	url = https://github.com/snoyberg/http-conduit
+[submodule "xml"]
+	path = xml
+	url = https://github.com/snoyberg/xml
+[submodule "crypto-conduit"]
+	path = crypto-conduit
+	url = https://github.com/snoyberg/crypto-conduit
+[submodule "yaml"]
+	path = yaml
+	url = https://github.com/snoyberg/yaml
diff --git a/crypto-conduit b/crypto-conduit
new file mode 160000
index 00000000..773ca387
--- /dev/null
+++ b/crypto-conduit
@@ -0,0 +1 @@
+Subproject commit 773ca3871b9c54d18499d69e9b42f122f43a29a8
diff --git a/http-conduit b/http-conduit
new file mode 160000
index 00000000..5a902e64
--- /dev/null
+++ b/http-conduit
@@ -0,0 +1 @@
+Subproject commit 5a902e6428b8c22953afe97437286f4062bd28ba
diff --git a/package-list.sh b/package-list.sh
index 958c9604..c20b5f5b 100644
--- a/package-list.sh
+++ b/package-list.sh
@@ -7,6 +7,10 @@ pkgs=(      ./yesod-routes
             ./yesod-persistent
             ./yesod-newsfeed
             ./yesod-form
+            ./yaml
+            ./http-conduit
+            ./crypto-conduit
+            ./xml/xml-conduit
             ./authenticate/authenticate
             ./authenticate/authenticate-oauth
             ./authenticate/authenticate-kerberos
diff --git a/xml b/xml
new file mode 160000
index 00000000..7612ce5f
--- /dev/null
+++ b/xml
@@ -0,0 +1 @@
+Subproject commit 7612ce5fc78dec2c32b837898b78aae98bfd7177
diff --git a/yaml b/yaml
new file mode 160000
index 00000000..78180d5c
--- /dev/null
+++ b/yaml
@@ -0,0 +1 @@
+Subproject commit 78180d5c9a0dc5c322c2529c38f5936e9ce21e70
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 40c9ad1d..8abc1ac4 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -79,7 +79,7 @@ library
                    , aeson                 >= 0.5
                    , fast-logger           >= 0.0.1
                    , wai-logger            >= 0.0.1
-                   , conduit               >= 0.0      && < 0.2
+                   , conduit               >= 0.2      && < 0.3
                    , lifted-base           >= 0.1      && < 0.2
 
     exposed-modules: Yesod.Content
diff --git a/yesod-json/yesod-json.cabal b/yesod-json/yesod-json.cabal
index e3dc99e5..a6b1d380 100644
--- a/yesod-json/yesod-json.cabal
+++ b/yesod-json/yesod-json.cabal
@@ -22,8 +22,8 @@ library
                    , vector                >= 0.9
                    , containers            >= 0.2
                    , blaze-builder
-                   , attoparsec-conduit    >= 0.0      && < 0.1
-                   , conduit               >= 0.0      && < 0.2
+                   , attoparsec-conduit    >= 0.2      && < 0.3
+                   , conduit               >= 0.2      && < 0.3
                    , transformers          >= 0.2.2    && < 0.3
                    , wai                   >= 1.1      && < 1.2
                    , wai-extra             >= 1.1      && < 1.2
diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal
index c011e339..7841b7ff 100644
--- a/yesod-static/yesod-static.cabal
+++ b/yesod-static/yesod-static.cabal
@@ -39,7 +39,7 @@ library
                    , file-embed            >= 0.0.4.1  && < 0.5
                    , http-types            >= 0.6.5    && < 0.7
                    , unix-compat           >= 0.2
-                   , conduit               >= 0.0
+                   , conduit               >= 0.2
                    , crypto-conduit        >= 0.1.1.2  && < 0.2
                    , cryptohash            >= 0.6.1
     exposed-modules: Yesod.Static