diff --git a/.travis.yml b/.travis.yml
index 9be27b7..c4c0d49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,12 @@
 language: c
-install:
-  - wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
-  - wget https://raw.githubusercontent.com/simonjbeaumont/ocaml-travis-coveralls/master/travis-coveralls.sh
-script: bash -ex .travis-opam.sh
+sudo: required
+service: docker
+install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-docker.sh
+script: bash -ex .travis-docker.sh
 env:
+  global:
+    - PACKAGE="cdrom"
+    - PINS="cdrom:."
+    - BASE_REMOTE="https://github.com/xapi-project/xs-opam.git"
   matrix:
-    - OCAML_VERSION=4.02 PACKAGE=cdrom
-    - OCAML_VERSION=4.03 PACKAGE=cdrom
-    - OCAML_VERSION=4.04 PACKAGE=cdrom
-    - OCAML_VERSION=4.05 PACKAGE=cdrom
+    - DISTRO="debian-9-ocaml-4.06"
diff --git a/ChangeLog b/ChangeLog
index 0d0507c..3e631ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+0.9.4 (06-Dec-2018):
+* port to dune
+
 0.9.3 (04-Aug-2017):
 * port to jbuilder
 
diff --git a/MAINTAINERS b/MAINTAINERS
index 3b46824..a7be550 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8,6 +8,4 @@ include a Signed-off-by: line.
 Maintainers list
 ----------------
 
-* David Scott <dave@recoil.org>
-* Euan Harris <euan.harris@citrix.com>
-
+* xen-api@list.xen.org
diff --git a/Makefile b/Makefile
index 05a1c88..b38ee0b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,25 @@
-.PHONY: build release install uninstall clean test doc reindent
+PROFILE=release
 
-build:
-	jbuilder build @install --dev
+.PHONY: build install uninstall clean test doc reindent
 
-release:
-	jbuilder build @install
+build:
+	dune build @install --profile=$(PROFILE)
 
 install:
-	jbuilder install
+	dune install
 
 uninstall:
-	jbuilder uninstall
+	dune uninstall
 
 clean:
-	jbuilder clean
+	dune clean
 
 test:
-	jbuilder runtest
+	dune runtest --profile=$(PROFILE)
 
 # requires odoc
 doc:
-	jbuilder build @doc
+	dune build @doc --profile=$(PROFILE)
 
 reindent:
-	ocp-indent --inplace **/*.ml
-	ocp-indent --inplace **/*.mli
+	git ls-files '*.ml*' | xargs ocp-indent --inplace
diff --git a/README.md b/README.md
index 7d67711..2f85d4d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 Query CDROM devices
 ===================
+
 [![Build Status](https://travis-ci.org/xapi-project/cdrom.svg?branch=master)](https://travis-ci.org/xapi-project/cdrom)
 
 Simple OCaml bindings for functions to query the state of CDROM devices.
diff --git a/cdrom.opam b/cdrom.opam
index 7108cd3..239b3d7 100644
--- a/cdrom.opam
+++ b/cdrom.opam
@@ -1,11 +1,15 @@
-opam-version: "1.2"
+opam-version: "2.0"
 name: "cdrom"
+version: "0.9.4"
 maintainer: "xen-api@list.xen.org"
-author: "Dave Scott <dave@recoil.org>"
 homepage: "https://github.com/xapi-project/cdrom"
-dev-repo: "https://github.com/xapi-project/cdrom"
+dev-repo: "git+https://github.com/xapi-project/cdrom.git"
 bug-reports: "https://github.com/xapi-project/cdrom/issues"
-build: ["jbuilder" "build" "-p" name "-j" jobs]
+build: ["dune" "build" "-p" name "-j" jobs]
 depends: [
-  "jbuilder" {build}
+  "ocaml"
+  "dune" {build}
 ]
+tags: [ "org:xapi-project" ]
+synopsis: "Query the state and contents of CDROM devices under Linux"
+authors: "Dave Scott <dave@recoil.org>"
diff --git a/cli/dune b/cli/dune
new file mode 100644
index 0000000..d41c118
--- /dev/null
+++ b/cli/dune
@@ -0,0 +1,5 @@
+(executable
+  (name query)
+  (public_name query-cdrom)
+  (libraries cdrom)
+)
diff --git a/cli/jbuild b/cli/jbuild
deleted file mode 100644
index 69186d4..0000000
--- a/cli/jbuild
+++ /dev/null
@@ -1,6 +0,0 @@
-(jbuild_version 1)
-
-(executable
-  ((name query)
-   (public_name query-cdrom)
-   (libraries (cdrom))))
diff --git a/dune-project b/dune-project
new file mode 100644
index 0000000..f933729
--- /dev/null
+++ b/dune-project
@@ -0,0 +1 @@
+(lang dune 1.4)
diff --git a/lib/dune b/lib/dune
new file mode 100644
index 0000000..701a465
--- /dev/null
+++ b/lib/dune
@@ -0,0 +1,6 @@
+(library
+  (name cdrom)
+  (public_name cdrom)
+  (libraries unix)
+  (c_names cdrom_stubs)
+)
diff --git a/lib/jbuild b/lib/jbuild
deleted file mode 100644
index d07c2d6..0000000
--- a/lib/jbuild
+++ /dev/null
@@ -1,7 +0,0 @@
-(jbuild_version 1)
-
-(library
-  ((name cdrom)
-   (public_name cdrom)
-   (libraries (unix))
-   (c_names  (cdrom_stubs))))