diff --git a/dune-project b/dune-project
index 967e90cf..1b9e3c60 100644
--- a/dune-project
+++ b/dune-project
@@ -1,2 +1,28 @@
-(lang dune 2.0)
+(lang dune 2.9)
 (name tiny_httpd)
+(generate_opam_files true)
+
+(version 0.14)
+(source (github c-cube/tiny_httpd))
+(homepage https://github.com/c-cube/tiny_httpd/)
+(license MIT)
+
+(package
+  (name tiny_httpd)
+  (synopsis "Minimal HTTP server using threads")
+  (tags (http thread server tiny_httpd http_of_dir simplehttpserver))
+  (depends
+    seq
+    (ocaml (>= 4.05))
+    (odoc :with-doc)
+    (conf-libcurl :with-test)
+    (ptime :with-test)
+    (qcheck-core (and (>= 0.9) :with-test))))
+
+(package
+  (name tiny_httpd_camlzip)
+  (synopsis "Interface to camlzip for tiny_httpd")
+  (depends
+    (tiny_httpd_camlzip (= :version))
+    (camlzip (>= 1.06))
+    (odoc :with-doc)))
diff --git a/tiny_httpd.opam b/tiny_httpd.opam
index 170a0ac4..1e877956 100644
--- a/tiny_httpd.opam
+++ b/tiny_httpd.opam
@@ -1,29 +1,36 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 version: "0.14"
-authors: ["Simon Cruanes"]
-maintainer: "simon.cruanes.2007@m4x.org"
+synopsis: "Minimal HTTP server using threads"
 license: "MIT"
-synopsis: "Minimal HTTP server using good old threads"
-build: [
-  ["dune" "build" "@install" "-p" name "-j" jobs]
-  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+tags: [
+  "http" "thread" "server" "tiny_httpd" "http_of_dir" "simplehttpserver"
 ]
+homepage: "https://github.com/c-cube/tiny_httpd/"
+bug-reports: "https://github.com/c-cube/tiny_httpd/issues"
 depends: [
-  "dune" { >= "2.0" }
-  "base-threads"
-  "result"
+  "dune" {>= "2.9"}
   "seq"
-  "ocaml" { >= "4.05.0" }
+  "ocaml" {>= "4.05"}
   "odoc" {with-doc}
   "conf-libcurl" {with-test}
   "ptime" {with-test}
-  "qcheck-core" {with-test & >= "0.9" }
-  "ptime" {with-test}
+  "qcheck-core" {>= "0.9" & with-test}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "--promote-install-files=false"
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+  ["dune" "install" "-p" name "--create-install-files" name]
 ]
-tags: [ "http" "thread" "server" "tiny_httpd" "http_of_dir" "simplehttpserver" ]
-homepage: "https://github.com/c-cube/tiny_httpd/"
-doc: "https://c-cube.github.io/tiny_httpd/"
-bug-reports: "https://github.com/c-cube/tiny_httpd/issues"
 dev-repo: "git+https://github.com/c-cube/tiny_httpd.git"
-post-messages: "tiny http server, with blocking IOs. Also ships with a `http_of_dir` program."
diff --git a/tiny_httpd_camlzip.opam b/tiny_httpd_camlzip.opam
index 5f175b95..0ec64002 100644
--- a/tiny_httpd_camlzip.opam
+++ b/tiny_httpd_camlzip.opam
@@ -1,23 +1,30 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 version: "0.14"
-authors: ["Simon Cruanes"]
-maintainer: "simon.cruanes.2007@m4x.org"
-license: "MIT"
 synopsis: "Interface to camlzip for tiny_httpd"
-build: [
-  ["dune" "build" "@install" "-p" name "-j" jobs]
-  ["dune" "build" "@doc" "-p" name] {with-doc}
-  ["dune" "runtest" "-p" name] {with-test}
-]
+license: "MIT"
+homepage: "https://github.com/c-cube/tiny_httpd/"
+bug-reports: "https://github.com/c-cube/tiny_httpd/issues"
 depends: [
-  "dune" { >= "2.0" }
+  "dune" {>= "2.9"}
+  "tiny_httpd_camlzip" {= version}
   "camlzip" {>= "1.06"}
-  "tiny_httpd" { = version }
-  "ocaml" { >= "4.05.0" }
   "odoc" {with-doc}
 ]
-tags: [ "http" "thread" "server" "gzip" "camlzip" ]
-homepage: "https://github.com/c-cube/tiny_httpd/"
-doc: "https://c-cube.github.io/tiny_httpd/"
-bug-reports: "https://github.com/c-cube/tiny_httpd/issues"
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "--promote-install-files=false"
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+  ["dune" "install" "-p" name "--create-install-files" name]
+]
 dev-repo: "git+https://github.com/c-cube/tiny_httpd.git"