diff --git a/jbuilder.descr b/jbuilder.descr
new file mode 100644
index 00000000..1a05525b
--- /dev/null
+++ b/jbuilder.descr
@@ -0,0 +1,18 @@
+Fast, portable and opinionated build system
+
+jbuilder is a build system that was designed to simplify the release
+of Jane Street packages. It reads metadata from "jbuild" files
+following a very simple s-expression syntax.
+
+jbuilder is fast, it has very low-overhead and support parallel builds
+on all platforms. It has no system dependencies, all you need to build
+jbuilder and packages using jbuilder is OCaml. You don't need or make
+or bash as long as the packages themselves don't use bash explicitely.
+
+jbuilder supports multi-package development by simply dropping multiple
+repositories into the same directory.
+
+It also supports multi-context builds, such as building against
+several opam roots/switches simultaneously. This helps maintaining
+packages across several versions of OCaml and gives cross-compilation
+for free.
diff --git a/jbuilder.opam b/jbuilder.opam
index 92fed522..59f3d203 100644
--- a/jbuilder.opam
+++ b/jbuilder.opam
@@ -20,26 +20,3 @@ depends: [
   "ocamlfind" {build}
 ]
 available: [ ocaml-version >= "4.02.3" ]
-
-# CR-soon jdimino: uncomment this when opam 2 is the norm:
-#
-# descr: "
-# Fast, portable and opinionated build system
-#
-# jbuilder is a build system that was designed to simplify the release
-# of Jane Street packages. It reads metadata from \"jbuild\" files
-# following a very simple s-expression syntax.
-#
-# jbuilder is fast, it has very low-overhead and support parallel builds
-# on all platforms. It has no system dependencies, all you need to build
-# jbuilder and packages using jbuilder is OCaml. You don't need or make
-# or bash as long as the packages themselves don't use bash explicitely.
-#
-# jbuilder supports multi-package development by simply dropping multiple
-# repositories into the same directory.
-#
-# It also supports multi-context builds, such as building against
-# several opam roots/switches simultaneously. This helps maintaining
-# packages across several versions of OCaml and gives cross-compilation
-# for free.
-# "