diff --git a/dune b/dune
index 798683f..6e63ea7 100644
--- a/dune
+++ b/dune
@@ -1,6 +1,6 @@
 
-(alias
- (name runtest)
+(rule
+ (alias runtest)
  (package ezcurl-lwt)
  (deps (:file README.md))
  (action
diff --git a/dune-project b/dune-project
index f852de0..f9b0352 100644
--- a/dune-project
+++ b/dune-project
@@ -1,3 +1,41 @@
-(lang dune 1.0)
+(lang dune 3.0)
+
 (name ezcurl)
+
 (version 0.2.4)
+
+(generate_opam_files true)
+
+(license MIT)
+
+(maintainers "simon.cruanes.2007@m4x.org")
+
+(authors "Simon Cruanes")
+(source (github c-cube/ezcurl))
+(documentation https://c-cube.github.io/ezcurl/)
+
+(package
+ (name ezcurl)
+ (synopsis "Friendly wrapper around OCurl")
+ (tags
+  ("curl" "web" "http" "client"))
+ (depends
+  (ocurl
+   (>= 0.8))
+  (odoc :with-doc)
+  (ocaml
+   (>= 4.03))))
+
+(package
+ (name ezcurl-lwt)
+ (synopsis "Friendly wrapper around OCurl, Lwt version")
+ (tags
+  ("curl" "web" "http" "client" "lwt"))
+ (depends
+  (ezcurl
+   (= :version))
+  lwt
+  (mdx :with-test)
+  (odoc :with-doc)
+  (ocaml
+   (>= 4.03))))
diff --git a/ezcurl-lwt.opam b/ezcurl-lwt.opam
index 4fa2d4a..47558dc 100644
--- a/ezcurl-lwt.opam
+++ b/ezcurl-lwt.opam
@@ -1,26 +1,34 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-name: "ezcurl-lwt"
 version: "0.2.4"
-authors: ["Simon Cruanes"]
-maintainer: "simon.cruanes.2007@m4x.org"
-license: "MIT"
 synopsis: "Friendly wrapper around OCurl, Lwt version"
-build: [
-  ["dune" "build" "@install" "-p" name "-j" jobs]
-  ["dune" "build" "@doc" "-p" name] {with-doc}
-  #["dune" "runtest" "-p" name] {with-test}
-]
-depends: [
-  "ocurl" {>= "0.8.0"}
-  "ezcurl" { = version }
-  "lwt"
-  "dune" { >= "1.0" }
-  "odoc" {with-doc}
-  "mdx" {with-test}
-  "ocaml" { >= "4.03.0" }
-]
-tags: [ "curl" "web" "http" "client" "lwt" ]
-homepage: "https://github.com/c-cube/ezcurl/"
-doc: "https://c-cube.github.io/ezcurl/doc/1.2"
+maintainer: ["simon.cruanes.2007@m4x.org"]
+authors: ["Simon Cruanes"]
+license: "MIT"
+tags: ["curl" "web" "http" "client" "lwt"]
+homepage: "https://github.com/c-cube/ezcurl"
+doc: "https://c-cube.github.io/ezcurl/"
 bug-reports: "https://github.com/c-cube/ezcurl/issues"
+depends: [
+  "dune" {>= "3.0"}
+  "ezcurl" {= version}
+  "lwt"
+  "mdx" {with-test}
+  "odoc" {with-doc}
+  "ocaml" {>= "4.03"}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
 dev-repo: "git+https://github.com/c-cube/ezcurl.git"
diff --git a/ezcurl.opam b/ezcurl.opam
index 414a8a4..666ea8b 100644
--- a/ezcurl.opam
+++ b/ezcurl.opam
@@ -1,23 +1,32 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-name: "ezcurl"
 version: "0.2.4"
-authors: ["Simon Cruanes"]
-maintainer: "simon.cruanes.2007@m4x.org"
-license: "MIT"
 synopsis: "Friendly wrapper around OCurl"
-build: [
-  ["dune" "build" "@install" "-p" name "-j" jobs]
-  ["dune" "build" "@doc" "-p" name] {with-doc}
-  #["dune" "runtest" "-p" name] {with-test}
-]
-depends: [
-  "ocurl" {>= "0.8.0"}
-  "dune" { >= "1.0" }
-  "odoc" {with-doc}
-  "ocaml" { >= "4.03.0" }
-]
-tags: [ "curl" "web" "http" "client" ]
-homepage: "https://github.com/c-cube/ezcurl/"
-doc: "https://c-cube.github.io/ezcurl/doc/1.2"
+maintainer: ["simon.cruanes.2007@m4x.org"]
+authors: ["Simon Cruanes"]
+license: "MIT"
+tags: ["curl" "web" "http" "client"]
+homepage: "https://github.com/c-cube/ezcurl"
+doc: "https://c-cube.github.io/ezcurl/"
 bug-reports: "https://github.com/c-cube/ezcurl/issues"
+depends: [
+  "dune" {>= "3.0"}
+  "ocurl" {>= "0.8"}
+  "odoc" {with-doc}
+  "ocaml" {>= "4.03"}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
 dev-repo: "git+https://github.com/c-cube/ezcurl.git"