diff --git a/.gitignore b/.gitignore
index ce9ae90c..f1914d18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ TAGS
 setup.*
 *.html
 .merlin
+*.install
+.ignore
diff --git a/Makefile b/Makefile
index e925f098..1528836e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,24 +2,24 @@
 all: build test
 
 build:
-	jbuilder build @install
+	dune build @install
 
 test: build
-	jbuilder runtest --no-buffer --force
+	dune runtest --no-buffer --force
 
 clean:
-	jbuilder clean
+	dune clean
 
 doc:
-	jbuilder build @doc
+	dune build @doc
 
 BENCH_TARGETS=run_benchs.exe run_bench_hash.exe
 
 benchs:
-	jbuilder build $(addprefix benchs/, $(BENCH_TARGETS))
+	dune build $(addprefix benchs/, $(BENCH_TARGETS))
 
 examples:
-	jbuilder build examples/id_sexp.exe
+	dune build examples/id_sexp.exe
 
 VERSION=$(shell awk '/^version:/ {print $$2}' containers.opam)
 
diff --git a/benchs/dune b/benchs/dune
new file mode 100644
index 00000000..f20137ff
--- /dev/null
+++ b/benchs/dune
@@ -0,0 +1,11 @@
+
+(executables
+  (names run_benchs run_bench_hash)
+  (libraries containers containers.data containers.iter
+             containers.thread benchmark gen sequence qcheck
+             batteries clarity)
+  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always)
+  (ocamlopt_flags :standard -O3 -color always
+                   -unbox-closures -unbox-closures-factor 20)
+  )
+
diff --git a/benchs/jbuild b/benchs/jbuild
deleted file mode 100644
index 5f81f2ef..00000000
--- a/benchs/jbuild
+++ /dev/null
@@ -1,11 +0,0 @@
-
-(executables
-  ((names (run_benchs run_bench_hash))
-   (libraries (containers containers.data containers.iter
-               containers.thread benchmark gen sequence qcheck
-               batteries clarity))
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always))
-   (ocamlopt_flags (:standard -O3 -color always
-                    -unbox-closures -unbox-closures-factor 20))
-  ))
-
diff --git a/containers.opam b/containers.opam
index 5dd1c72a..7b376f0c 100644
--- a/containers.opam
+++ b/containers.opam
@@ -4,12 +4,12 @@ version: "2.3"
 author: "Simon Cruanes"
 maintainer: "simon.cruanes.2007@m4x.org"
 build: [
-    ["jbuilder" "build" "-p" name "-j" jobs]
+    ["dune" "build" "-p" name "-j" jobs]
 ]
-build-doc: [ "jbuilder" "build" "@doc" ]
-build-test: [ "jbuilder" "runtest" "-p" name "-j" jobs]
+build-doc: [ "dune" "build" "@doc" ]
+build-test: [ "dune" "runtest" "-p" name "-j" jobs]
 depends: [
-  "jbuilder" {build & >= "1.0+beta12"}
+  "dune" {build}
   "result"
   "uchar"
   "qtest" { test }
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/dune b/examples/dune
new file mode 100644
index 00000000..23a68421
--- /dev/null
+++ b/examples/dune
@@ -0,0 +1,10 @@
+
+(executables
+  (names id_sexp)
+  (libraries containers.sexp)
+  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always)
+  (ocamlopt_flags :standard -O3 -color always
+                   -unbox-closures -unbox-closures-factor 20)
+  )
+
+
diff --git a/examples/jbuild b/examples/jbuild
deleted file mode 100644
index e7d75a09..00000000
--- a/examples/jbuild
+++ /dev/null
@@ -1,10 +0,0 @@
-
-(executables
-  ((names (id_sexp))
-   (libraries (containers.sexp))
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always))
-   (ocamlopt_flags (:standard -O3 -color always
-                    -unbox-closures -unbox-closures-factor 20))
-  ))
-
-
diff --git a/qtest/dune b/qtest/dune
new file mode 100644
index 00000000..12c206df
--- /dev/null
+++ b/qtest/dune
@@ -0,0 +1,31 @@
+
+(executable
+  (name make)
+  (modules make)
+  )
+
+(rule
+  (targets run_qtest.ml)
+  (deps make.bc (source_tree ../src))
+  ;(libraries (qtest qcheck))
+  (action
+    (run ./make.bc -target %{targets}))
+  )
+
+(executable
+  (name run_qtest)
+  (modes native)
+  (modules run_qtest)
+  ; disable some warnings in qtests
+  (flags :standard -warn-error -a -w -33-35-27-39 -nolabels)
+  (libraries sequence gen qcheck containers containers.unix
+             containers.data containers.thread containers.iter
+             containers.sexp uutf)
+  )
+
+(alias
+  (name    runtest)
+  (deps    run_qtest.exe)
+  (action  (run %{deps}))
+  )
+
diff --git a/qtest/jbuild b/qtest/jbuild
deleted file mode 100644
index a321fb6a..00000000
--- a/qtest/jbuild
+++ /dev/null
@@ -1,30 +0,0 @@
-
-(executable
-  ((name make)
-   (modules (make))
-   ))
-
-(rule
-  ((targets (run_qtest.ml))
-   (deps (make.bc (files_recursively_in ../src)))
-   ;(libraries (qtest qcheck))
-   (action
-     (run ./make.bc -target ${@}))
-  ))
-
-(executable
-  ((name run_qtest)
-   (modes (native))
-   (modules (run_qtest))
-   (flags (:standard -nolabels))
-   (libraries (sequence gen qcheck containers containers.unix
-               containers.data containers.thread containers.iter
-               containers.sexp uutf))
-  ))
-
-(alias
- ((name    runtest)
-  (deps    (run_qtest.exe))
-  (action  (run ${<}))
-  ))
-
diff --git a/src/core/dune b/src/core/dune
new file mode 100644
index 00000000..00101fdf
--- /dev/null
+++ b/src/core/dune
@@ -0,0 +1,9 @@
+
+(library
+  (name containers)
+  (public_name containers)
+  (wrapped false)
+  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -nolabels -open CCMonomorphic)
+  (ocamlopt_flags (:include ../flambda.flags))
+  (libraries result uchar containers.monomorphic)
+  )
diff --git a/src/core/jbuild b/src/core/jbuild
deleted file mode 100644
index 3c3f8615..00000000
--- a/src/core/jbuild
+++ /dev/null
@@ -1,9 +0,0 @@
-
-(library
-  ((name containers)
-   (public_name containers)
-   (wrapped false)
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -nolabels -open CCMonomorphic))
-   (ocamlopt_flags ((:include ../flambda.flags)))
-   (libraries (result uchar containers.monomorphic))
-  ))
diff --git a/src/data/dune b/src/data/dune
new file mode 100644
index 00000000..ed738693
--- /dev/null
+++ b/src/data/dune
@@ -0,0 +1,9 @@
+
+(library
+  (name containers_data)
+  (public_name containers.data)
+  (wrapped false)
+  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
+  (ocamlopt_flags :standard (:include ../flambda.flags))
+  (libraries result)
+  )
diff --git a/src/data/jbuild b/src/data/jbuild
deleted file mode 100644
index 3f5bf259..00000000
--- a/src/data/jbuild
+++ /dev/null
@@ -1,9 +0,0 @@
-
-(library
-  ((name containers_data)
-   (public_name containers.data)
-   (wrapped false)
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string))
-   (ocamlopt_flags (:standard (:include ../flambda.flags)))
-   (libraries (result))
-  ))
diff --git a/src/dune b/src/dune
new file mode 100644
index 00000000..001e66a9
--- /dev/null
+++ b/src/dune
@@ -0,0 +1,12 @@
+
+(executable
+  (name mkflags)
+  (libraries dune.configurator))
+
+(rule
+  (targets flambda.flags)
+  (mode fallback)
+  (action
+    (run ./mkflags.exe))
+  )
+
diff --git a/src/iter/dune b/src/iter/dune
new file mode 100644
index 00000000..795ddc8b
--- /dev/null
+++ b/src/iter/dune
@@ -0,0 +1,9 @@
+
+(library
+  (name containers_iter)
+  (public_name containers.iter)
+  (wrapped false)
+  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
+  (ocamlopt_flags :standard (:include ../flambda.flags))
+  (libraries result)
+  )
diff --git a/src/iter/jbuild b/src/iter/jbuild
deleted file mode 100644
index b2cab584..00000000
--- a/src/iter/jbuild
+++ /dev/null
@@ -1,9 +0,0 @@
-
-(library
-  ((name containers_iter)
-   (public_name containers.iter)
-   (wrapped false)
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string))
-   (ocamlopt_flags (:standard (:include ../flambda.flags)))
-   (libraries (result))
-  ))
diff --git a/src/jbuild b/src/jbuild
deleted file mode 100644
index 9829e886..00000000
--- a/src/jbuild
+++ /dev/null
@@ -1,12 +0,0 @@
-
-(executable
-  ((name mkflags)
-   (libraries (dune.configurator))))
-
-(rule
-  ((targets (flambda.flags))
-   (fallback)
-   (action
-     (run ./mkflags.exe))
-  ))
-
diff --git a/src/monomorphic/dune b/src/monomorphic/dune
new file mode 100644
index 00000000..0322d471
--- /dev/null
+++ b/src/monomorphic/dune
@@ -0,0 +1,8 @@
+
+(library
+  (name containers_monomorphic)
+  (public_name containers.monomorphic)
+  (wrapped false)
+  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
+  (ocamlopt_flags :standard (:include ../flambda.flags))
+  )
diff --git a/src/monomorphic/jbuild b/src/monomorphic/jbuild
deleted file mode 100644
index 4eeaac49..00000000
--- a/src/monomorphic/jbuild
+++ /dev/null
@@ -1,9 +0,0 @@
-
-(library
-  ((name containers_monomorphic)
-   (public_name containers.monomorphic)
-   (wrapped false)
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string))
-   (ocamlopt_flags (:standard (:include ../flambda.flags)))
-   (libraries ())
-  ))
diff --git a/src/sexp/dune b/src/sexp/dune
new file mode 100644
index 00000000..0066e698
--- /dev/null
+++ b/src/sexp/dune
@@ -0,0 +1,11 @@
+
+(library
+  (name containers_sexp)
+  (public_name containers.sexp)
+  (wrapped false)
+  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
+  (ocamlopt_flags :standard (:include ../flambda.flags))
+  (libraries result)
+  )
+
+(ocamllex (modules CCSexp_lex))
diff --git a/src/sexp/jbuild b/src/sexp/jbuild
deleted file mode 100644
index 743e3b30..00000000
--- a/src/sexp/jbuild
+++ /dev/null
@@ -1,11 +0,0 @@
-
-(library
-  ((name containers_sexp)
-   (public_name containers.sexp)
-   (wrapped false)
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string))
-   (ocamlopt_flags (:standard (:include ../flambda.flags)))
-   (libraries (result))
-  ))
-
-(ocamllex (CCSexp_lex))
diff --git a/src/threads/dune b/src/threads/dune
new file mode 100644
index 00000000..504d9d99
--- /dev/null
+++ b/src/threads/dune
@@ -0,0 +1,11 @@
+
+(library
+  (name containers_thread)
+  (public_name containers.thread)
+  (wrapped false)
+  (optional)
+  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
+  (ocamlopt_flags :standard (:include ../flambda.flags))
+  (libraries containers threads)
+  )
+
diff --git a/src/threads/jbuild b/src/threads/jbuild
deleted file mode 100644
index 7af8cbef..00000000
--- a/src/threads/jbuild
+++ /dev/null
@@ -1,11 +0,0 @@
-
-(library
-  ((name containers_thread)
-   (public_name containers.thread)
-   (wrapped false)
-   (optional)
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string))
-   (ocamlopt_flags (:standard (:include ../flambda.flags)))
-   (libraries (containers threads))
-  ))
-
diff --git a/src/top/dune b/src/top/dune
new file mode 100644
index 00000000..226f2347
--- /dev/null
+++ b/src/top/dune
@@ -0,0 +1,11 @@
+
+
+(library
+  (name containers_top)
+  (public_name containers.top)
+  (wrapped false)
+  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
+  (ocamlopt_flags :standard (:include ../flambda.flags))
+  (libraries compiler-libs.common containers containers.data
+             containers.unix containers.sexp containers.iter)
+  )
diff --git a/src/top/jbuild b/src/top/jbuild
deleted file mode 100644
index 3bd8a254..00000000
--- a/src/top/jbuild
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-(library
-  ((name containers_top)
-   (public_name containers.top)
-   (wrapped false)
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string))
-   (ocamlopt_flags (:standard (:include ../flambda.flags)))
-   (libraries (compiler-libs.common containers containers.data
-               containers.unix containers.sexp containers.iter))
-  ))
diff --git a/src/unix/dune b/src/unix/dune
new file mode 100644
index 00000000..5bc04571
--- /dev/null
+++ b/src/unix/dune
@@ -0,0 +1,10 @@
+
+(library
+  (name containers_unix)
+  (public_name containers.unix)
+  (wrapped false)
+  (optional)
+  (flags :standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string)
+  (ocamlopt_flags :standard (:include ../flambda.flags))
+  (libraries result unix)
+  )
diff --git a/src/unix/jbuild b/src/unix/jbuild
deleted file mode 100644
index ef81a336..00000000
--- a/src/unix/jbuild
+++ /dev/null
@@ -1,10 +0,0 @@
-
-(library
-  ((name containers_unix)
-   (public_name containers.unix)
-   (wrapped false)
-   (optional)
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string))
-   (ocamlopt_flags (:standard (:include ../flambda.flags)))
-   (libraries (result unix))
-  ))