diff --git a/CHANGES.md b/CHANGES.md
index c9e45ce..3abb4cf 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,8 @@
+v1.0.2
+--------------------------
+Upgrade jbuilder to dune
+
+
 v1.0.1
 --------------------------
 
diff --git a/dune-project b/dune-project
new file mode 100644
index 0000000..74f4c3f
--- /dev/null
+++ b/dune-project
@@ -0,0 +1,2 @@
+(lang dune 1.0)
+(name wtf8)
diff --git a/src/dune b/src/dune
new file mode 100644
index 0000000..dd950de
--- /dev/null
+++ b/src/dune
@@ -0,0 +1,3 @@
+(library
+ (name wtf8)
+ (public_name wtf8))
diff --git a/src/jbuild b/src/jbuild
deleted file mode 100644
index c27dea2..0000000
--- a/src/jbuild
+++ /dev/null
@@ -1,6 +0,0 @@
-(jbuild_version 1)
-
-(library (
-  (name wtf8)
-  (public_name wtf8)
-))
diff --git a/wtf8.descr b/wtf8.descr
deleted file mode 100644
index 8a95302..0000000
--- a/wtf8.descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Encoder and decoder for WTF-8
-
-WTF-8 is a superset of UTF-8 that allows unpaired surrogates.
diff --git a/wtf8.opam b/wtf8.opam
index be2c7bd..f27b444 100644
--- a/wtf8.opam
+++ b/wtf8.opam
@@ -1,17 +1,20 @@
-opam-version: "1.2"
+opam-version: "2.0"
 maintainer: "Marshall Roch <mroch@fb.com>"
-authors: ["Marshall Roch <mroch@fb.com>"]
+authors: "Marshall Roch <mroch@fb.com>"
+license: "MIT"
 homepage: "https://github.com/flowtype/ocaml-wtf8"
 doc: "https://github.com/flowtype/ocaml-wtf8"
-license: "MIT"
-dev-repo: "https://github.com/flowtype/ocaml-wtf8.git"
 bug-reports: "https://github.com/flowtype/ocaml-wtf8/issues"
-tags: []
-available: [ ocaml-version >= "4.01.0"]
-depends:
-[
-  "jbuilder" {build & >= "1.0+beta7"}
+depends: [
+  "ocaml" {>= "4.01.0"}
+  "dune" {build & >= "1.0"}
+]
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-depopts: []
-build: [["jbuilder" "build" "-p" name "-j" jobs]]
-build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+dev-repo: "git+https://github.com/flowtype/ocaml-wtf8.git"
+synopsis: "Encoder and decoder for WTF-8"
+description: """
+WTF-8 is a superset of UTF-8 that allows unpaired surrogates.
+"""