diff --git a/.travis.yml b/.travis.yml
index 9cf4dbe..9be4fbf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ language: c
 script: bash -ex ./.docker-run.sh
 env:
   global:
-  - OCAML_VERSIONS="4.03.0 4.04.2 4.05.0 4.06.0"
+  - OCAML_VERSIONS="4.03.0 4.04.2 4.05.0 4.06.0 4.07.0"
   matrix:
   - DISTRO="debian-9"
   - DISTRO="alpine-3.6"
diff --git a/CHANGES.md b/CHANGES.md
index 967e9b6..3411a1a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
 
 * Add ARM32 (aarch32, arm32v7) architecture.
 * Add more OCaml 4.07.0 functions and mark it as latest stable.
+* Port to Dune from Jbuilder.
 
 ## v0.4.0
 
diff --git a/Makefile b/Makefile
index fa187c0..6957a12 100644
--- a/Makefile
+++ b/Makefile
@@ -2,22 +2,22 @@
 .PHONY: build clean test
 
 build:
-	jbuilder build @install --dev
+	dune build @install --dev
 
 doc:
-	jbuilder build @doc
+	dune build @doc
 
 test:
-	jbuilder runtest
+	dune runtest
 
 install:
-	jbuilder install
+	dune install
 
 uninstall:
-	jbuilder uninstall
+	dune uninstall
 
 clean:
-	jbuilder clean
+	dune clean
 
 publish-doc: doc
 	rm -rf .gh-pages
diff --git a/dune b/dune
new file mode 100644
index 0000000..15678d3
--- /dev/null
+++ b/dune
@@ -0,0 +1,3 @@
+(library
+ (name ocaml_version) 
+  (public_name ocaml-version))
diff --git a/dune-project b/dune-project
new file mode 100644
index 0000000..b3bd052
--- /dev/null
+++ b/dune-project
@@ -0,0 +1,2 @@
+(lang dune 1.0)
+(name ocaml-version)
diff --git a/jbuild b/jbuild
deleted file mode 100644
index 54f9c76..0000000
--- a/jbuild
+++ /dev/null
@@ -1,6 +0,0 @@
-(jbuild_version 1)
-
-(library
- ((name       ocaml_version) 
-  (public_name ocaml-version)
- ))
diff --git a/ocaml-version.opam b/ocaml-version.opam
index 5d1a837..66d3d4e 100644
--- a/ocaml-version.opam
+++ b/ocaml-version.opam
@@ -8,10 +8,10 @@ dev-repo: "https://github.com/avsm/ocaml-version.git"
 bug-reports: "https://github.com/avsm/ocaml-version/issues"
 tags: ["org:ocamllabs"]
 depends: [
-  "jbuilder" {build & >="1.0+beta10"}
+  "dune" {build}
 ]
 build: [
-  ["jbuilder" "subst" "-p" name "--name" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
 ]
 available: [ ocaml-version >= "4.03.0"]
diff --git a/pkg/pkg.ml b/pkg/pkg.ml
deleted file mode 100644
index 1a04c2b..0000000
--- a/pkg/pkg.ml
+++ /dev/null
@@ -1,2 +0,0 @@
-#use "topfind"
-#require "topkg-jbuilder.auto"