diff --git a/nbd-tool.opam b/nbd-tool.opam
index 82876f1..773523d 100644
--- a/nbd-tool.opam
+++ b/nbd-tool.opam
@@ -19,12 +19,17 @@ depends: [
   "lwt_log"
   "mirage-block-unix"
   "nbd-unix" {=version}
+  "odoc" {with-doc}
   "uri"
 ]
 depexts: [
   ["qemu-img" "nbd" "nmap-ncat"] {with-test & os-family = "rhel"}
   ["qemu-utils" "nbd-client" "netcat-openbsd"] {with-test & os-family = "debian"}
 ]
-build: ["dune" "build" "-p" name "-j" jobs]
-run-test: ["dune" "runtest" "-p" name "-j" jobs]
+build: [
+  ["dune" "subst"] {dev}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "build" "-p" name "-j" jobs "@doc"] {with-doc}
+  ["dune" "build" "-p" name "-j" jobs "@runtest"] {with-test}
+]
 dev-repo: "git+https://github.com/xapi-project/nbd.git"
diff --git a/nbd-unix.opam b/nbd-unix.opam
index 3ee072d..648d1ac 100644
--- a/nbd-unix.opam
+++ b/nbd-unix.opam
@@ -18,10 +18,11 @@ depends: [
   "io-page"
   "io-page-unix"
   "lwt" {>= "2.7.0"}
+  "lwt_ssl"
   "mirage-block" {>= "2.0.0"}
   "mirage-block-unix"
   "nbd" {=version}
-  "lwt_ssl"
+  "odoc" {with-doc}
   "ssl"
 ]
 build: [
diff --git a/nbd.opam b/nbd.opam
index 3d163f7..b96fe05 100644
--- a/nbd.opam
+++ b/nbd.opam
@@ -6,28 +6,31 @@ homepage: "https://github.com/xapi-project/nbd"
 doc: "https://xapi-project.github.io/nbd/nbd/index.html"
 dev-repo: "git+https://github.com/xapi-project/nbd.git"
 bug-reports: "https://github.com/xapi-project/nbd/issues"
-
-build: ["dune" "build" "-p" name "-j" jobs]
-run-test: ["dune" "runtest" "-p" name "-j" jobs]
-
+build: [
+  ["dune" "subst"] {dev}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "build" "-p" name "-j" jobs "@doc"] {with-doc}
+  ["dune" "build" "-p" name "-j" jobs "@runtest"] {with-test}
+]
 depends: [
   "ocaml" {>= "4.08.0"}
   "bisect_ppx" {dev & >= "2.5.0"}
   "dune" {>= "2.7.0"}
   "alcotest" {with-test}
   "alcotest-lwt" {with-test}
-  "io-page-unix" {with-test}
   "cstruct" {>= "3.1.0"}
   "io-page"
+  "io-page-unix" {with-test}
   "mirage-block" {>= "2.0.0"}
   "mirage-block-unix"
   "lwt" {>= "2.7.0"}
   "lwt_log"
+  "odoc" {with-doc}
+  "ppx_cstruct" {>= "3.1.0"}
+  "ppx_sexp_conv" {>= "v0.9.0"}
   "rresult"
   "sexplib"
   "uri"
-  "ppx_cstruct" {>= "3.1.0"}
-  "ppx_sexp_conv" {>= "v0.9.0"}
 ]
 tags: [ "org:mirage" "org:xapi-project" ]
 synopsis: "Network Block Device (NBD) protocol implementation"