diff --git a/calculon-web.opam b/calculon-web.opam
index c99f226..d57e90e 100644
--- a/calculon-web.opam
+++ b/calculon-web.opam
@@ -1,27 +1,33 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-name: "calculon-web"
 version: "0.8"
-license: "MIT"
 synopsis: "A collection of web plugins for Calculon"
-authors: ["Armael" "Enjolras" "c-cube"]
-maintainer: "c-cube"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
+authors: ["c-cube" "Enjolras" "Armael"]
+license: "MIT"
+homepage: "https://github.com/c-cube/calculon"
+bug-reports: "https://github.com/c-cube/calculon/issues"
 depends: [
-  "dune" { >= "1.1" }
-  "calculon" { = version }
-  "re" { >= "1.7.2" }
+  "dune"
+  "calculon" {= version}
+  "re" {>= "1.7.2"}
   "uri"
   "curly"
   "atdgen"
   "lambdasoup"
   "odoc" {with-doc}
-  "ocaml" { >= "4.03.0" }
 ]
-tags: [ "irc" "bot" "factoids" ]
-homepage: "https://github.com/c-cube/calculon"
-bug-reports: "https://github.com/c-cube/calculon/issues"
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
 dev-repo: "git+https://github.com/c-cube/calculon.git"
diff --git a/calculon.opam b/calculon.opam
index 6919646..2f65c20 100644
--- a/calculon.opam
+++ b/calculon.opam
@@ -1,39 +1,41 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-name: "calculon"
 version: "0.8"
+authors: ["c-cube" "Enjolras" "Armael"]
 license: "MIT"
-synopsis: "Library for writing IRC bots in OCaml and a collection of plugins"
-authors: ["Armael" "Enjolras" "c-cube"]
-maintainer: "c-cube"
-build: [
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
-]
+tags: ["irc" "bot" "factoids"]
+homepage: "https://github.com/c-cube/calculon"
+bug-reports: "https://github.com/c-cube/calculon/issues"
 depends: [
-  "dune" { >= "1.1" }
+  "dune" {>= "1.1"}
   "base-unix"
   "lwt"
-  "irc-client" { >= "0.7.0"}
+  "irc-client" {>= "0.7.0"}
   "irc-client-lwt"
   "irc-client-lwt-ssl"
-  "sqlite3" { >= "5.0.0" }
+  "sqlite3" {>= "5.0.0"}
   "logs" {>= "0.5.0"}
-  "yojson" { >= "1.7" }
-  "containers" { >= "3.6" & < "4.0" }
+  "yojson" {>= "1.7"}
+  "containers" {>= "3.6" & < "4.0"}
   "ptime"
   "stringext"
-  "re" { >= "1.7.2" & < "2.0" }
+  "re" {>= "1.7.2" & < "2.0"}
   "odoc" {with-doc}
-  "ocaml" { >= "4.08.0" }
+  "ocaml" {>= "4.08.0"}
 ]
-depopts: [
-  "iter"
-]
-conflicts: [
-  "result" { < "1.5" }
+depopts: ["iter"]
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
-tags: [ "irc" "bot" "factoids" ]
-homepage: "https://github.com/c-cube/calculon"
-bug-reports: "https://github.com/c-cube/calculon/issues"
 dev-repo: "git+https://github.com/c-cube/calculon.git"
diff --git a/dune-project b/dune-project
index de4fc20..eb2d0d1 100644
--- a/dune-project
+++ b/dune-project
@@ -1 +1,61 @@
-(lang dune 1.0)
+(lang dune 2.0)
+
+(generate_opam_files true)
+
+(version 0.8)
+
+(source
+ (github c-cube/calculon))
+
+(license MIT)
+
+(authors c-cube Enjolras Armael)
+
+(package
+ (name calculon)
+ (depends
+  ("dune"
+   (>= "1.1"))
+  "base-unix"
+  "lwt"
+  ("irc-client"
+   (>= "0.7.0"))
+  "irc-client-lwt"
+  "irc-client-lwt-ssl"
+  ("sqlite3"
+   (>= "5.0.0"))
+  ("logs"
+   (>= "0.5.0"))
+  ("yojson"
+   (>= "1.7"))
+  ("containers"
+   (and
+    (>= "3.6")
+    (< "4.0")))
+  "ptime"
+  "stringext"
+  ("re"
+   (and
+    (>= "1.7.2")
+    (< "2.0")))
+  ("odoc" :with-doc)
+  ("ocaml"
+   (>= "4.08.0")))
+ (depopts iter)
+ (tags
+  ("irc" "bot" "factoids")))
+
+(package
+ (name calculon-web)
+ (synopsis "A collection of web plugins for Calculon")
+ (depends
+  "dune"
+  ("calculon"
+   (= :version))
+  ("re"
+   (>= "1.7.2"))
+  "uri"
+  "curly"
+  "atdgen"
+  "lambdasoup"
+  ("odoc" :with-doc)))