diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix
new file mode 100644
index 00000000000..dbb83f4c8cf
--- /dev/null
+++ b/pkgs/development/ocaml-modules/conduit/default.nix
@@ -0,0 +1,24 @@
+{stdenv, buildOcaml, fetchurl, sexplib, stringext, uri, cstruct, ipaddr,
+ async ? null, async_ssl ? null, lwt ? null}:
+
+buildOcaml rec {
+  name = "conduit";
+  version = "0.8.3";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-conduit/archive/v${version}.tar.gz";
+    sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1";
+  };
+
+  propagatedBuildInputs = ([ sexplib stringext uri cstruct ipaddr ]
+                            ++ stdenv.lib.optional (lwt != null) lwt
+                            ++ stdenv.lib.optional (async != null) async
+                            ++ stdenv.lib.optional (async_ssl != null) async_ssl);
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mirage/ocaml-conduit;
+    description = "Resolve URIs into communication channels for Async or Lwt ";
+    license = licenses.mit;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81d66fd2c0f..ad7cd690723 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4108,6 +4108,10 @@ let
     };
     camlimages = camlimages_4_1;
 
+    conduit = callPackage ../development/ocaml-modules/conduit {
+       lwt = ocaml_lwt;
+    };
+
     biniou = callPackage ../development/ocaml-modules/biniou { };
 
     bin_prot = callPackage ../development/ocaml-modules/bin_prot { };