diff --git a/dune-project b/dune-project
index 0d5f8995..268ca51b 100644
--- a/dune-project
+++ b/dune-project
@@ -1,4 +1,62 @@
 (lang dune 2.0)
+
 ;(implicit_transitive_deps false)
+
+(generate_opam_files true)
+
 (using menhir 2.0)
+
 (name linol)
+
+(version 0.5)
+
+(license MIT)
+
+(authors "Simon Cruanes")
+
+(source
+ (github c-cube/linol))
+
+(package
+ (name linol)
+ (synopsis "LSP server library")
+ (depends
+  ("yojson"
+   (>= "1.6"))
+  "logs"
+  ("trace"
+   (>= "0.4"))
+  ("lsp"
+   (and
+    (>= "1.17")
+    (< "1.18")))
+  ("jsonrpc"
+   (and
+    (>= "1.17")
+    (< "1.18")))
+  ("ocaml"
+   (>= "4.14"))
+  ("odoc" :with-doc)))
+
+(package
+ (name linol-lwt)
+ (synopsis "LSP server library (with Lwt for concurrency)")
+ (depends
+  ("yojson"
+   (>= "1.6"))
+  ("linol"
+   (= :version))
+  base-unix
+  ("lwt"
+   (and
+    (>= "5.1")
+    (< "6.0")))
+  ("lsp"
+   (and
+    (>= "1.17")
+    (< "1.18")))
+  ("jsonrpc"
+   (and
+    (>= "1.17")
+    (< "1.18")))
+  ("odoc" :with-doc)))
diff --git a/linol-lwt.opam b/linol-lwt.opam
index 51df4c51..a516485a 100644
--- a/linol-lwt.opam
+++ b/linol-lwt.opam
@@ -1,26 +1,33 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 version: "0.5"
-license: "MIT"
-maintainer: "simon.cruanes.2007@m4x.org"
-author: "Simon Cruanes"
-homepage: "https://github.com/c-cube/linol"
 synopsis: "LSP server library (with Lwt for concurrency)"
-build: [
-  ["dune" "build" "@install" "-p" name "-j" jobs]
-  ["dune" "build" "@runtest" "-p" name "-j" jobs] {with-test}
-  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
-]
-depends: [
-  "dune" { >= "2.0" }
-  "linol" { = version }
-  "lwt" { >= "5.1" & < "6.0" }
-  "base-unix"
-  "yojson" { >= "1.6" }
-  "ocaml" { >= "4.08" }
-  "odoc" { with-doc }
-]
-tags: [ "lsp" "server" "lwt" "linol" ]
+authors: ["Simon Cruanes"]
+license: "MIT"
+homepage: "https://github.com/c-cube/linol"
 bug-reports: "https://github.com/c-cube/linol/issues"
+depends: [
+  "dune" {>= "2.0"}
+  "yojson" {>= "1.6"}
+  "linol" {= version}
+  "base-unix"
+  "lwt" {>= "5.1" & < "6.0"}
+  "lsp" {>= "1.17" & < "1.18"}
+  "jsonrpc" {>= "1.17" & < "1.18"}
+  "odoc" {with-doc}
+]
+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/linol.git"
-
-
diff --git a/linol.opam b/linol.opam
index baae74b4..3286dc64 100644
--- a/linol.opam
+++ b/linol.opam
@@ -1,27 +1,33 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
 version: "0.5"
-maintainer: "simon.cruanes.2007@m4x.org"
-license: "MIT"
-author: "Simon Cruanes"
-homepage: "https://github.com/c-cube/linol"
 synopsis: "LSP server library"
-build: [
-  ["dune" "build" "@install" "-p" name "-j" jobs]
-  ["dune" "build" "@runtest" "-p" name "-j" jobs] {with-test}
-  ["dune" "build" "@doc" "-p" name "-j" jobs] {with-doc}
-]
-depends: [
-  "dune" { >= "2.0" }
-  "yojson" { >= "1.6" }
-  "logs"
-  "trace" { >= "0.4" }
-  "lsp" { >= "1.17" & < "1.18" }
-  "jsonrpc" { >= "1.17" & < "1.18" }
-  "ocaml" { >= "4.14" }
-  "odoc" { with-doc }
-]
-tags: [ "lsp" "server" "lwt" ]
+authors: ["Simon Cruanes"]
+license: "MIT"
+homepage: "https://github.com/c-cube/linol"
 bug-reports: "https://github.com/c-cube/linol/issues"
+depends: [
+  "dune" {>= "2.0"}
+  "yojson" {>= "1.6"}
+  "logs"
+  "trace" {>= "0.4"}
+  "lsp" {>= "1.17" & < "1.18"}
+  "jsonrpc" {>= "1.17" & < "1.18"}
+  "ocaml" {>= "4.14"}
+  "odoc" {with-doc}
+]
+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/linol.git"
-
-