diff --git a/dune-project b/dune-project
index 09180d3..8d0d233 100644
--- a/dune-project
+++ b/dune-project
@@ -1,2 +1,27 @@
-(lang dune 1.0)
+(lang dune 1.11)
 (name utop)
+
+(generate_opam_files)
+(source (github ocaml-community/utop))
+(documentation https://ocaml-community.github.io/utop/)
+(license BSD-3-Clause)
+(maintainers jeremie@dimino.org)
+(authors "Jérémie Dimino")
+
+(package
+ (name utop)
+ (synopsis "Universal toplevel for OCaml")
+ (description
+  "utop is an improved toplevel (i.e., Read-Eval-Print Loop or REPL) for OCaml. It can run in a terminal or in Emacs. It supports line edition, history, real-time and context sensitive completion, colors, and more. It integrates with the Tuareg mode in Emacs.")
+ (depends
+  (ocaml (>= 4.08.0))
+  base-unix
+  base-threads
+  (ocamlfind (>= 1.7.2))
+  (lambda-term (and (>= 3.1.0) (< 4.0)))
+  logs
+  lwt
+  lwt_react
+  (zed (>= 3.2.0))
+  (react (>= 1.0.0))
+  (cppo (>= 1.1.2))))
diff --git a/utop.opam b/utop.opam
index f0472c8..7e1e5c7 100644
--- a/utop.opam
+++ b/utop.opam
@@ -1,11 +1,16 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-maintainer: "jeremie@dimino.org"
-authors: "Jérémie Dimino"
+synopsis: "Universal toplevel for OCaml"
+description:
+  "utop is an improved toplevel (i.e., Read-Eval-Print Loop or REPL) for OCaml. It can run in a terminal or in Emacs. It supports line edition, history, real-time and context sensitive completion, colors, and more. It integrates with the Tuareg mode in Emacs."
+maintainer: ["jeremie@dimino.org"]
+authors: ["Jérémie Dimino"]
 license: "BSD-3-Clause"
 homepage: "https://github.com/ocaml-community/utop"
-bug-reports: "https://github.com/ocaml-community/utop/issues"
 doc: "https://ocaml-community.github.io/utop/"
+bug-reports: "https://github.com/ocaml-community/utop/issues"
 depends: [
+  "dune" {>= "1.11"}
   "ocaml" {>= "4.08.0"}
   "base-unix"
   "base-threads"
@@ -14,21 +19,22 @@ depends: [
   "logs"
   "lwt"
   "lwt_react"
-  "zed" { >= "3.2.0" }
+  "zed" {>= "3.2.0"}
   "react" {>= "1.0.0"}
-  "cppo" {build & >= "1.1.2"}
-  "dune" {>= "1.0"}
+  "cppo" {>= "1.1.2"}
 ]
 build: [
-  ["dune" "subst"] {dev}
-  ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
 dev-repo: "git+https://github.com/ocaml-community/utop.git"
-synopsis: "Universal toplevel for OCaml"
-description: """
-utop is an improved toplevel (i.e., Read-Eval-Print Loop or REPL) for
-OCaml.  It can run in a terminal or in Emacs. It supports line
-edition, history, real-time and context sensitive completion, colors,
-and more.  It integrates with the Tuareg mode in Emacs.
-"""