diff --git a/Makefile b/Makefile
index 545f648..5d18619 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,10 @@
 .PHONY: build doc clean
 
 build:
-	jbuilder build -j16
+	dune build
 
 doc:
-	@echo "waiting for jbuilder odoc support"
-	@#topkg doc
+	dune build @doc
 
 clean:
-	-rm -R _build
-	-rm octavius.install
+	dune clean
diff --git a/dune-project b/dune-project
new file mode 100644
index 0000000..4017685
--- /dev/null
+++ b/dune-project
@@ -0,0 +1,15 @@
+(lang dune 1.11)
+(name octavius)
+
+(generate_opam_files true)
+
+(maintainers leo@lpw25.net)
+(authors "Leo White <leo@lpw25.net>")
+(source (github ocaml-doc/octavius))
+(documentation http://ocaml-doc.github.io/octavius/)
+(license ISC)
+
+(package
+ (name octavius)
+ (depends (ocaml (>= 4.03.0)))
+ (tags (doc ocamldoc org:ocaml-doc)))
diff --git a/octavius.opam b/octavius.opam
index 3210bb4..964de2b 100644
--- a/octavius.opam
+++ b/octavius.opam
@@ -1,21 +1,27 @@
-opam-version: "1.2"
-name: "octavius"
-maintainer: "leo@lpw25.net"
-authors: [ "Leo White <leo@lpw25.net>" ]
+# This file is generated by dune, edit dune-project instead
+opam-version: "2.0"
+maintainer: ["leo@lpw25.net"]
+authors: ["Leo White <leo@lpw25.net>"]
+license: "ISC"
 homepage: "https://github.com/ocaml-doc/octavius"
 doc: "http://ocaml-doc.github.io/octavius/"
-license: "ISC"
-dev-repo: "http://github.com/ocaml-doc/octavius.git"
 bug-reports: "https://github.com/ocaml-doc/octavius/issues"
-tags: ["doc" "ocamldoc" "org:ocaml-doc"]
-
-available: [ ocaml-version >= "4.03.0"]
 depends: [
-  "ocamlfind" {build}
-  "jbuilder" {build}
-  "topkg" {build & >= "0.7.5"} ]
-
+  "dune" {>= "1.11"}
+  "ocaml" {>= "4.03.0"}
+]
 build: [
-  ["jbuilder" "subst"] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
+dev-repo: "git+https://github.com/ocaml-doc/octavius.git"
diff --git a/pkg/pkg.ml b/pkg/pkg.ml
deleted file mode 100755
index 4d12667..0000000
--- a/pkg/pkg.ml
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ocaml
-#use "topfind"
-#require "topkg-jbuilder.auto"
diff --git a/src/dune b/src/dune
new file mode 100644
index 0000000..fc0a826
--- /dev/null
+++ b/src/dune
@@ -0,0 +1,7 @@
+(ocamllex octLexer)
+
+(ocamlyacc octParser)
+
+(library
+ (name octavius)
+ (public_name octavius))
diff --git a/src/jbuild b/src/jbuild
deleted file mode 100644
index 319a17b..0000000
--- a/src/jbuild
+++ /dev/null
@@ -1,8 +0,0 @@
-(jbuild_version 1)
-
-(ocamllex  (octLexer))
-(ocamlyacc (octParser))
-
-(library
- ((name octavius)
-  (public_name octavius)))
diff --git a/test/dune b/test/dune
new file mode 100644
index 0000000..3ac3838
--- /dev/null
+++ b/test/dune
@@ -0,0 +1,4 @@
+(executable
+ (name main)
+ (public_name octavius)
+ (libraries octavius compiler-libs.common))
diff --git a/test/jbuild b/test/jbuild
deleted file mode 100644
index 16c64e5..0000000
--- a/test/jbuild
+++ /dev/null
@@ -1,6 +0,0 @@
-(jbuild_version 1)
-
-(executable
- ((name main)
-  (public_name octavius)
-  (libraries (octavius compiler-libs.common))))