diff --git a/Makefile b/Makefile
old mode 100755
new mode 100644
index dff0e5ca..998c3006
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,23 @@
+.PHONY: all
 all:
-	@jbuilder build @install @DEFAULT
+	@dune build @install @examples
 
-test:
-	@jbuilder runtest
-
-check: test
+.PHONY: run-examples
+run-examples:
+	dune exec examples/filtering.exe < examples/filtering.json
 
+.PHONY: install
 install:
-	@jbuilder install
+	@dune install
 
+.PHONY: uninstall
 uninstall:
-	@jbuilder uninstall
+	@dune uninstall
 
+.PHONY: bench
 bench:
-	@jbuilder build bench/bench.exe
-
-.PHONY: clean all bench test check install uninstall
+	@dune build bench/bench.exe
 
+.PHONY: clean
 clean:
-	jbuilder clean
+	@dune clean
diff --git a/README.md b/README.md
index 060f22cb..a6508f32 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,7 @@ _This library is for manipulating the json AST directly. For mapping between OCa
 Library documentation
 ---------------------
 
-Currently at https://mjambon.github.io/mjambon2016/yojson-doc/Yojson.html
-
-_The link above is for the ocamldoc-generated of some past version of yojson. Suggestions on how to keep this documentation updated automatically for each minor release are welcome._
+Currently at https://ocaml-community.github.io/yojson/
 
 Design goals
 ------------
diff --git a/bench/dune b/bench/dune
new file mode 100644
index 00000000..1a43829a
--- /dev/null
+++ b/bench/dune
@@ -0,0 +1,5 @@
+;; doesn't actually build b/c json_io doesn't exist
+(executable
+ (name bench)
+ (flags (-safe-string))
+ (libraries yojson))
diff --git a/bench/jbuild b/bench/jbuild
deleted file mode 100644
index a439e116..00000000
--- a/bench/jbuild
+++ /dev/null
@@ -1,7 +0,0 @@
-;; doesn't actually build b/c json_io doesn't exist
-(jbuild_version 1)
-
-(executable
- ((name bench)
-  (flags (-safe-string))
-  (libraries (yojson))))
diff --git a/bin/dune b/bin/dune
new file mode 100644
index 00000000..3c6532c2
--- /dev/null
+++ b/bin/dune
@@ -0,0 +1,5 @@
+(executable
+ (name ydump)
+ (public_name ydump)
+ (flags (-safe-string))
+ (libraries yojson))
diff --git a/bin/jbuild b/bin/jbuild
deleted file mode 100644
index 0e14cca8..00000000
--- a/bin/jbuild
+++ /dev/null
@@ -1,7 +0,0 @@
-(jbuild_version 1)
-
-(executable
- ((name ydump)
-  (public_name ydump)
-  (flags (-safe-string))
-  (libraries (yojson))))
diff --git a/dune-project b/dune-project
new file mode 100644
index 00000000..de4fc209
--- /dev/null
+++ b/dune-project
@@ -0,0 +1 @@
+(lang dune 1.0)
diff --git a/examples/Makefile b/examples/Makefile
deleted file mode 100644
index ab58ad91..00000000
--- a/examples/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-.PHONY: default
-default:
-	./run-examples.sh
-
-clean:
-	rm -f *.o *.a *.cm* *~ *.annot filtering
diff --git a/examples/dune b/examples/dune
new file mode 100644
index 00000000..b3c35177
--- /dev/null
+++ b/examples/dune
@@ -0,0 +1,8 @@
+(executable
+ (name filtering)
+ (flags (-safe-string))
+ (libraries yojson))
+
+(alias
+ (name examples)
+ (deps filtering.exe))
diff --git a/examples/filtering.ml b/examples/filtering.ml
index d70f6099..3546f9fb 100644
--- a/examples/filtering.ml
+++ b/examples/filtering.ml
@@ -1,6 +1,5 @@
 (*
-  ocamlfind ocamlopt -o filtering filtering.ml -package yojson -linkpkg
-  ./filtering <<EOF
+  dune exec examples/filtering.exe <<EOF
 {
   "id": "398eb027",
   "name": "John Doe",
diff --git a/examples/jbuild b/examples/jbuild
deleted file mode 100644
index 4c5a021b..00000000
--- a/examples/jbuild
+++ /dev/null
@@ -1,10 +0,0 @@
-(jbuild_version 1)
-
-(executables
- ((names (filtering))
-  (flags (-safe-string))
-  (libraries (yojson))))
-
-(alias
- ((name DEFAULT)
-  (deps (filtering.exe))))
diff --git a/examples/run-examples.sh b/examples/run-examples.sh
deleted file mode 100755
index 4c72ed6f..00000000
--- a/examples/run-examples.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-echo "----- Example 1: filtering -----"
-ocamlfind ocamlopt -o filtering filtering.ml -package yojson -linkpkg
-./filtering < filtering.json
diff --git a/lib/dune b/lib/dune
new file mode 100644
index 00000000..574f3337
--- /dev/null
+++ b/lib/dune
@@ -0,0 +1,38 @@
+(ocamllex read)
+
+(rule
+ (targets yojson.ml)
+ (deps
+   (:out yojson.cppo.ml)
+   read.ml
+   write.ml
+   safe.ml
+   pretty.ml
+   write2.ml
+   common.ml
+   util.ml
+   type.ml)
+  (action (run cppo %{out} -o %{targets})))
+
+(rule
+ (targets yojson.mli)
+ (deps
+   (:out yojson.cppo.mli)
+   write.mli
+   read.mli
+   safe.mli
+   pretty.mli
+   write2.mli
+   common.mli
+   util.mli
+   type.ml)
+ (action (run cppo %{out} -o %{targets})))
+
+(library
+ (name yojson)
+ (public_name yojson)
+ (modules yojson yojson_biniou)
+ (wrapped false)
+ (synopsis "JSON parsing and printing (successor of json-wheel)")
+ (flags (-safe-string))
+ (libraries easy-format biniou))
diff --git a/lib/jbuild b/lib/jbuild
deleted file mode 100644
index 3f82564b..00000000
--- a/lib/jbuild
+++ /dev/null
@@ -1,40 +0,0 @@
-(jbuild_version 1)
-
-(ocamllex (read))
-
-(rule
- ((targets (yojson.ml))
-  (deps
-   (yojson.cppo.ml
-    read.ml
-    write.ml
-    safe.ml
-    pretty.ml
-    write2.ml
-    common.ml
-    util.ml
-    type.ml))
-  (action (run cppo ${<} -o ${@}))))
-
-(rule
- ((targets (yojson.mli))
-  (deps
-   (yojson.cppo.mli
-    write.mli
-    read.mli
-    safe.mli
-    pretty.mli
-    write2.mli
-    common.mli
-    util.mli
-    type.ml))
-  (action (run cppo ${<} -o ${@}))))
-
-(library
- ((name yojson)
-  (public_name yojson)
-  (modules (yojson yojson_biniou))
-  (wrapped false)
-  (synopsis "JSON parsing and printing (successor of json-wheel)")
-  (flags (-safe-string))
-  (libraries (easy-format biniou))))
diff --git a/pkg/pkg.ml b/pkg/pkg.ml
deleted file mode 100644
index 1a04c2b4..00000000
--- a/pkg/pkg.ml
+++ /dev/null
@@ -1,2 +0,0 @@
-#use "topfind"
-#require "topkg-jbuilder.auto"
diff --git a/yojson.opam b/yojson.opam
index ef332518..80b22776 100644
--- a/yojson.opam
+++ b/yojson.opam
@@ -6,13 +6,12 @@ bug-reports: "https://github.com/ocaml-community/yojson/issues"
 dev-repo: "git+https://github.com/ocaml-community/yojson.git"
 doc: "https://ocaml-community.github.io/yojson/"
 build: [
-  ["jbuilder" "subst" "-n" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
 ]
-run-test: ["jbuilder" "runtest" "-p" name]
 depends: [
   "ocaml" {>= "4.02.3"}
-  "jbuilder" {build}
+  "dune" {build}
   "cppo" {build}
   "easy-format"
   "biniou" {>= "1.2.0"}