diff --git a/.gitignore b/.gitignore
index b48ed60..b1e3d75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,6 @@ tmp
 \#*#
 *.install
 *.native
-*.byte
\ No newline at end of file
+*.byte
+.merlin
+.DS_Store
diff --git a/CHANGES.md b/CHANGES.md
index 088f17a..2274435 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+v0.3.2 2019-06-16
+--------------------------
+
+Upgrade jbuilder to dune
+
+
 v0.3.1 2017-12-06
 --------------------------
 
diff --git a/dtoa.descr b/dtoa.descr
deleted file mode 100644
index c03640e..0000000
--- a/dtoa.descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Converts OCaml floats into strings (doubles to ascii, "d to a"), using the efficient Grisu3 algorithm.
-
-This is a (partial) port of Google's double-conversion library from C++ to C.
diff --git a/dtoa.opam b/dtoa.opam
index 789929f..912f0fd 100644
--- a/dtoa.opam
+++ b/dtoa.opam
@@ -1,18 +1,21 @@
-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-dtoa"
 doc: "https://github.com/flowtype/ocaml-dtoa"
-license: "MIT"
-dev-repo: "https://github.com/flowtype/ocaml-dtoa.git"
 bug-reports: "https://github.com/flowtype/ocaml-dtoa/issues"
-tags: []
-available: [ ocaml-version >= "4.01.0"]
-depends:
-[
-  "jbuilder" {build & >= "1.0+beta7"}
-  "ounit" {test & >= "2.0.0"}
+depends: [
+  "ocaml" {>= "4.01.0"}
+  "dune" {build & >= "1.0"}
+  "ounit" {with-test & >= "2.0.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-dtoa.git"
+synopsis: "Converts OCaml floats into strings (doubles to ascii, 'd to a'), using the efficient Grisu3 algorithm"
+description: """
+This is a (partial) port of Google's double-conversion library from C++ to C.
+"""
diff --git a/dune-project b/dune-project
new file mode 100644
index 0000000..c1e1f59
--- /dev/null
+++ b/dune-project
@@ -0,0 +1,2 @@
+(lang dune 1.0)
+(name dtoa)
diff --git a/pkg/pkg.ml b/pkg/pkg.ml
deleted file mode 100644
index 5ea7f0c..0000000
--- a/pkg/pkg.ml
+++ /dev/null
@@ -1,6 +0,0 @@
-(* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved *)
-
-#use "topfind"
-#require "topkg-jbuilder"
-
-let () = Topkg_jbuilder.describe ~licenses:[ Topkg.Pkg.std_file "LICENSE" ] ()
diff --git a/src/.merlin b/src/.merlin
deleted file mode 100644
index 828d52c..0000000
--- a/src/.merlin
+++ /dev/null
@@ -1,2 +0,0 @@
-B ../_build/default/src
-FLG -w -40
diff --git a/src/dune b/src/dune
new file mode 100644
index 0000000..db0c3e3
--- /dev/null
+++ b/src/dune
@@ -0,0 +1,8 @@
+(library
+ (name dtoa)
+ (public_name dtoa)
+ (c_names bignum bignum_dtoa cached_powers diy_fp dtoa_stubs ieee fast_dtoa)
+ (c_flags -std=c99 -g -Wall -Wshadow -Werror -Wextra -Wshadow
+   -Wno-unused-parameter)
+ (js_of_ocaml
+  (javascript_files ../js/dtoa_stubs.js)))
diff --git a/src/jbuild b/src/jbuild
deleted file mode 100644
index 6b5f783..0000000
--- a/src/jbuild
+++ /dev/null
@@ -1,22 +0,0 @@
-(jbuild_version 1)
-
-(library (
-  (name dtoa)
-  (public_name dtoa)
-  (c_names (
-    bignum
-    bignum_dtoa
-    cached_powers
-    diy_fp
-    dtoa_stubs
-    ieee
-    fast_dtoa
-  ))
-  (c_flags (
-    -std=c99 -g -Wall
-    -Wshadow -Werror -Wextra -Wshadow -Wno-unused-parameter
-  ))
-  (js_of_ocaml (
-    (javascript_files (../js/dtoa_stubs.js))
-  ))
-))
diff --git a/test/.merlin b/test/.merlin
deleted file mode 100644
index e11935c..0000000
--- a/test/.merlin
+++ /dev/null
@@ -1,7 +0,0 @@
-B ../_build/default/src
-B ../_build/default/test
-FLG -w -40
-PKG oUnit
-PKG oUnit.advanced
-PKG unix
-S ../src
diff --git a/test/dune b/test/dune
new file mode 100644
index 0000000..6a4b3b9
--- /dev/null
+++ b/test/dune
@@ -0,0 +1,10 @@
+(executable
+ (name test)
+ (libraries dtoa oUnit))
+
+(alias
+ (name runtest)
+ (deps
+  (:< test.exe))
+ (action
+  (run %{<})))
diff --git a/test/jbuild b/test/jbuild
deleted file mode 100644
index f30557e..0000000
--- a/test/jbuild
+++ /dev/null
@@ -1,12 +0,0 @@
-(jbuild_version 1)
-
-(executable (
-  (name test)
-  (libraries (dtoa oUnit))
-))
-
-(alias (
-  (name runtest)
-  (deps (test.exe))
-  (action (run ${<}))
-))