diff --git a/docs/doc_gen/jbuild b/docs/doc_gen/dune
similarity index 100%
rename from docs/doc_gen/jbuild
rename to docs/doc_gen/dune
diff --git a/docs/doc_gen/errors/jbuild b/docs/doc_gen/errors/dune
similarity index 100%
rename from docs/doc_gen/errors/jbuild
rename to docs/doc_gen/errors/dune
diff --git a/jbuild b/dune
similarity index 100%
rename from jbuild
rename to dune
diff --git a/dune-project b/dune-project
deleted file mode 100644
index d40049b3d..000000000
--- a/dune-project
+++ /dev/null
@@ -1,2 +0,0 @@
-(lang dune 1.0)
-(name tezos)
diff --git a/scripts/jbuild b/scripts/jbuild
deleted file mode 100644
index 3d579b2cb..000000000
--- a/scripts/jbuild
+++ /dev/null
@@ -1,2 +0,0 @@
-(jbuild_version 1)
-
diff --git a/src/bin_client/jbuild b/src/bin_client/dune
similarity index 100%
rename from src/bin_client/jbuild
rename to src/bin_client/dune
diff --git a/src/bin_client/test/jbuild b/src/bin_client/test/dune
similarity index 100%
rename from src/bin_client/test/jbuild
rename to src/bin_client/test/dune
diff --git a/src/bin_node/jbuild b/src/bin_node/dune
similarity index 100%
rename from src/bin_node/jbuild
rename to src/bin_node/dune
diff --git a/src/bin_signer/jbuild b/src/bin_signer/dune
similarity index 100%
rename from src/bin_signer/jbuild
rename to src/bin_signer/dune
diff --git a/src/lib_base/jbuild b/src/lib_base/dune
similarity index 100%
rename from src/lib_base/jbuild
rename to src/lib_base/dune
diff --git a/src/lib_clic/jbuild b/src/lib_clic/dune
similarity index 100%
rename from src/lib_clic/jbuild
rename to src/lib_clic/dune
diff --git a/src/lib_client_base/jbuild b/src/lib_client_base/dune
similarity index 100%
rename from src/lib_client_base/jbuild
rename to src/lib_client_base/dune
diff --git a/src/lib_client_base_unix/jbuild b/src/lib_client_base_unix/dune
similarity index 100%
rename from src/lib_client_base_unix/jbuild
rename to src/lib_client_base_unix/dune
diff --git a/src/lib_client_commands/jbuild b/src/lib_client_commands/dune
similarity index 100%
rename from src/lib_client_commands/jbuild
rename to src/lib_client_commands/dune
diff --git a/src/lib_crypto/jbuild b/src/lib_crypto/dune
similarity index 100%
rename from src/lib_crypto/jbuild
rename to src/lib_crypto/dune
diff --git a/src/lib_crypto/test/jbuild b/src/lib_crypto/test/dune
similarity index 100%
rename from src/lib_crypto/test/jbuild
rename to src/lib_crypto/test/dune
diff --git a/src/lib_data_encoding/jbuild b/src/lib_data_encoding/dune
similarity index 100%
rename from src/lib_data_encoding/jbuild
rename to src/lib_data_encoding/dune
diff --git a/src/lib_data_encoding/test/jbuild b/src/lib_data_encoding/test/dune
similarity index 100%
rename from src/lib_data_encoding/test/jbuild
rename to src/lib_data_encoding/test/dune
diff --git a/src/lib_error_monad/jbuild b/src/lib_error_monad/dune
similarity index 100%
rename from src/lib_error_monad/jbuild
rename to src/lib_error_monad/dune
diff --git a/src/lib_micheline/jbuild b/src/lib_micheline/dune
similarity index 100%
rename from src/lib_micheline/jbuild
rename to src/lib_micheline/dune
diff --git a/src/lib_p2p/jbuild b/src/lib_p2p/dune
similarity index 100%
rename from src/lib_p2p/jbuild
rename to src/lib_p2p/dune
diff --git a/src/lib_p2p/test/jbuild b/src/lib_p2p/test/dune
similarity index 100%
rename from src/lib_p2p/test/jbuild
rename to src/lib_p2p/test/dune
diff --git a/src/lib_protocol_compiler/jbuild b/src/lib_protocol_compiler/dune
similarity index 100%
rename from src/lib_protocol_compiler/jbuild
rename to src/lib_protocol_compiler/dune
diff --git a/src/lib_protocol_environment/jbuild b/src/lib_protocol_environment/dune
similarity index 100%
rename from src/lib_protocol_environment/jbuild
rename to src/lib_protocol_environment/dune
diff --git a/src/lib_protocol_environment/sigs/jbuild b/src/lib_protocol_environment/sigs/dune
similarity index 100%
rename from src/lib_protocol_environment/sigs/jbuild
rename to src/lib_protocol_environment/sigs/dune
diff --git a/src/lib_protocol_environment/sigs_packer/jbuild b/src/lib_protocol_environment/sigs_packer/dune
similarity index 100%
rename from src/lib_protocol_environment/sigs_packer/jbuild
rename to src/lib_protocol_environment/sigs_packer/dune
diff --git a/src/lib_protocol_environment/test/jbuild b/src/lib_protocol_environment/test/dune
similarity index 100%
rename from src/lib_protocol_environment/test/jbuild
rename to src/lib_protocol_environment/test/dune
diff --git a/src/lib_protocol_updater/jbuild b/src/lib_protocol_updater/dune
similarity index 100%
rename from src/lib_protocol_updater/jbuild
rename to src/lib_protocol_updater/dune
diff --git a/src/lib_rpc/jbuild b/src/lib_rpc/dune
similarity index 100%
rename from src/lib_rpc/jbuild
rename to src/lib_rpc/dune
diff --git a/src/lib_rpc_http/jbuild b/src/lib_rpc_http/dune
similarity index 100%
rename from src/lib_rpc_http/jbuild
rename to src/lib_rpc_http/dune
diff --git a/src/lib_shell/bench/jbuild b/src/lib_shell/bench/dune
similarity index 100%
rename from src/lib_shell/bench/jbuild
rename to src/lib_shell/bench/dune
diff --git a/src/lib_shell/bench/helpers/jbuild b/src/lib_shell/bench/helpers/dune
similarity index 100%
rename from src/lib_shell/bench/helpers/jbuild
rename to src/lib_shell/bench/helpers/dune
diff --git a/src/lib_shell/jbuild b/src/lib_shell/dune
similarity index 100%
rename from src/lib_shell/jbuild
rename to src/lib_shell/dune
diff --git a/src/lib_shell/test/jbuild b/src/lib_shell/test/dune
similarity index 100%
rename from src/lib_shell/test/jbuild
rename to src/lib_shell/test/dune
diff --git a/src/lib_shell_services/jbuild b/src/lib_shell_services/dune
similarity index 100%
rename from src/lib_shell_services/jbuild
rename to src/lib_shell_services/dune
diff --git a/src/lib_signer_backends/jbuild b/src/lib_signer_backends/dune
similarity index 100%
rename from src/lib_signer_backends/jbuild
rename to src/lib_signer_backends/dune
diff --git a/src/lib_signer_backends/test/jbuild b/src/lib_signer_backends/test/dune
similarity index 100%
rename from src/lib_signer_backends/test/jbuild
rename to src/lib_signer_backends/test/dune
diff --git a/src/lib_signer_services/jbuild b/src/lib_signer_services/dune
similarity index 100%
rename from src/lib_signer_services/jbuild
rename to src/lib_signer_services/dune
diff --git a/src/lib_stdlib/jbuild b/src/lib_stdlib/dune
similarity index 100%
rename from src/lib_stdlib/jbuild
rename to src/lib_stdlib/dune
diff --git a/src/lib_stdlib/test/jbuild b/src/lib_stdlib/test/dune
similarity index 100%
rename from src/lib_stdlib/test/jbuild
rename to src/lib_stdlib/test/dune
diff --git a/src/lib_stdlib_unix/jbuild b/src/lib_stdlib_unix/dune
similarity index 100%
rename from src/lib_stdlib_unix/jbuild
rename to src/lib_stdlib_unix/dune
diff --git a/src/lib_storage/jbuild b/src/lib_storage/dune
similarity index 100%
rename from src/lib_storage/jbuild
rename to src/lib_storage/dune
diff --git a/src/lib_storage/test/jbuild b/src/lib_storage/test/dune
similarity index 100%
rename from src/lib_storage/test/jbuild
rename to src/lib_storage/test/dune
diff --git a/src/proto_alpha/bin_accuser/jbuild b/src/proto_alpha/bin_accuser/dune
similarity index 100%
rename from src/proto_alpha/bin_accuser/jbuild
rename to src/proto_alpha/bin_accuser/dune
diff --git a/src/proto_alpha/bin_baker/jbuild b/src/proto_alpha/bin_baker/dune
similarity index 100%
rename from src/proto_alpha/bin_baker/jbuild
rename to src/proto_alpha/bin_baker/dune
diff --git a/src/proto_alpha/bin_endorser/jbuild b/src/proto_alpha/bin_endorser/dune
similarity index 100%
rename from src/proto_alpha/bin_endorser/jbuild
rename to src/proto_alpha/bin_endorser/dune
diff --git a/src/proto_alpha/lib_client/jbuild b/src/proto_alpha/lib_client/dune
similarity index 100%
rename from src/proto_alpha/lib_client/jbuild
rename to src/proto_alpha/lib_client/dune
diff --git a/src/proto_alpha/lib_client_commands/jbuild b/src/proto_alpha/lib_client_commands/dune
similarity index 100%
rename from src/proto_alpha/lib_client_commands/jbuild
rename to src/proto_alpha/lib_client_commands/dune
diff --git a/src/proto_alpha/lib_delegate/jbuild b/src/proto_alpha/lib_delegate/dune
similarity index 100%
rename from src/proto_alpha/lib_delegate/jbuild
rename to src/proto_alpha/lib_delegate/dune
diff --git a/src/proto_alpha/lib_delegate/test/jbuild b/src/proto_alpha/lib_delegate/test/dune
similarity index 100%
rename from src/proto_alpha/lib_delegate/test/jbuild
rename to src/proto_alpha/lib_delegate/test/dune
diff --git a/src/proto_alpha/lib_protocol/jbuild b/src/proto_alpha/lib_protocol/dune
similarity index 100%
rename from src/proto_alpha/lib_protocol/jbuild
rename to src/proto_alpha/lib_protocol/dune
diff --git a/src/proto_alpha/lib_protocol/src/jbuild b/src/proto_alpha/lib_protocol/src/dune
similarity index 100%
rename from src/proto_alpha/lib_protocol/src/jbuild
rename to src/proto_alpha/lib_protocol/src/dune
diff --git a/src/proto_alpha/lib_protocol/test/jbuild b/src/proto_alpha/lib_protocol/test/dune
similarity index 100%
rename from src/proto_alpha/lib_protocol/test/jbuild
rename to src/proto_alpha/lib_protocol/test/dune
diff --git a/src/proto_alpha/lib_protocol/test/helpers/jbuild b/src/proto_alpha/lib_protocol/test/helpers/dune
similarity index 100%
rename from src/proto_alpha/lib_protocol/test/helpers/jbuild
rename to src/proto_alpha/lib_protocol/test/helpers/dune
diff --git a/src/proto_alpha/lib_protocol/test/michelson_parser/jbuild b/src/proto_alpha/lib_protocol/test/michelson_parser/dune
similarity index 100%
rename from src/proto_alpha/lib_protocol/test/michelson_parser/jbuild
rename to src/proto_alpha/lib_protocol/test/michelson_parser/dune
diff --git a/src/proto_demo/lib_protocol/jbuild b/src/proto_demo/lib_protocol/dune
similarity index 100%
rename from src/proto_demo/lib_protocol/jbuild
rename to src/proto_demo/lib_protocol/dune
diff --git a/src/proto_demo/lib_protocol/src/jbuild b/src/proto_demo/lib_protocol/src/dune
similarity index 100%
rename from src/proto_demo/lib_protocol/src/jbuild
rename to src/proto_demo/lib_protocol/src/dune
diff --git a/src/proto_genesis/lib_client/jbuild b/src/proto_genesis/lib_client/dune
similarity index 100%
rename from src/proto_genesis/lib_client/jbuild
rename to src/proto_genesis/lib_client/dune
diff --git a/src/proto_genesis/lib_protocol/jbuild b/src/proto_genesis/lib_protocol/dune
similarity index 100%
rename from src/proto_genesis/lib_protocol/jbuild
rename to src/proto_genesis/lib_protocol/dune
diff --git a/src/proto_genesis/lib_protocol/src/jbuild b/src/proto_genesis/lib_protocol/src/dune
similarity index 100%
rename from src/proto_genesis/lib_protocol/src/jbuild
rename to src/proto_genesis/lib_protocol/src/dune
diff --git a/vendors/irmin-lmdb/jbuild b/vendors/irmin-lmdb/dune
similarity index 100%
rename from vendors/irmin-lmdb/jbuild
rename to vendors/irmin-lmdb/dune
diff --git a/vendors/ocaml-bip39/src/jbuild b/vendors/ocaml-bip39/src/dune
similarity index 100%
rename from vendors/ocaml-bip39/src/jbuild
rename to vendors/ocaml-bip39/src/dune
diff --git a/vendors/ocaml-bip39/test/jbuild b/vendors/ocaml-bip39/test/dune
similarity index 100%
rename from vendors/ocaml-bip39/test/jbuild
rename to vendors/ocaml-bip39/test/dune
diff --git a/vendors/ocaml-blake2/src/jbuild b/vendors/ocaml-blake2/src/dune
similarity index 100%
rename from vendors/ocaml-blake2/src/jbuild
rename to vendors/ocaml-blake2/src/dune
diff --git a/vendors/ocaml-blake2/test/jbuild b/vendors/ocaml-blake2/test/dune
similarity index 100%
rename from vendors/ocaml-blake2/test/jbuild
rename to vendors/ocaml-blake2/test/dune
diff --git a/vendors/ocaml-hacl/src/config/jbuild b/vendors/ocaml-hacl/src/config/dune
similarity index 100%
rename from vendors/ocaml-hacl/src/config/jbuild
rename to vendors/ocaml-hacl/src/config/dune
diff --git a/vendors/ocaml-hacl/src/jbuild b/vendors/ocaml-hacl/src/dune
similarity index 100%
rename from vendors/ocaml-hacl/src/jbuild
rename to vendors/ocaml-hacl/src/dune
diff --git a/vendors/ocaml-hacl/test/jbuild b/vendors/ocaml-hacl/test/dune
similarity index 100%
rename from vendors/ocaml-hacl/test/jbuild
rename to vendors/ocaml-hacl/test/dune
diff --git a/vendors/ocaml-ledger-wallet/src/jbuild b/vendors/ocaml-ledger-wallet/src/dune
similarity index 100%
rename from vendors/ocaml-ledger-wallet/src/jbuild
rename to vendors/ocaml-ledger-wallet/src/dune
diff --git a/vendors/ocaml-ledger-wallet/test/jbuild b/vendors/ocaml-ledger-wallet/test/dune
similarity index 100%
rename from vendors/ocaml-ledger-wallet/test/jbuild
rename to vendors/ocaml-ledger-wallet/test/dune
diff --git a/vendors/ocaml-lmdb/config/jbuild b/vendors/ocaml-lmdb/config/dune
similarity index 100%
rename from vendors/ocaml-lmdb/config/jbuild
rename to vendors/ocaml-lmdb/config/dune
diff --git a/vendors/ocaml-lmdb/src/jbuild b/vendors/ocaml-lmdb/src/dune
similarity index 100%
rename from vendors/ocaml-lmdb/src/jbuild
rename to vendors/ocaml-lmdb/src/dune
diff --git a/vendors/ocaml-lmdb/test/jbuild b/vendors/ocaml-lmdb/test/dune
similarity index 100%
rename from vendors/ocaml-lmdb/test/jbuild
rename to vendors/ocaml-lmdb/test/dune
diff --git a/vendors/ocaml-pbkdf/src/jbuild b/vendors/ocaml-pbkdf/src/dune
similarity index 100%
rename from vendors/ocaml-pbkdf/src/jbuild
rename to vendors/ocaml-pbkdf/src/dune
diff --git a/vendors/ocaml-pbkdf/test/jbuild b/vendors/ocaml-pbkdf/test/dune
similarity index 100%
rename from vendors/ocaml-pbkdf/test/jbuild
rename to vendors/ocaml-pbkdf/test/dune
diff --git a/vendors/ocaml-secp256k1/config/jbuild b/vendors/ocaml-secp256k1/config/dune
similarity index 100%
rename from vendors/ocaml-secp256k1/config/jbuild
rename to vendors/ocaml-secp256k1/config/dune
diff --git a/vendors/ocaml-secp256k1/src/jbuild b/vendors/ocaml-secp256k1/src/dune
similarity index 100%
rename from vendors/ocaml-secp256k1/src/jbuild
rename to vendors/ocaml-secp256k1/src/dune
diff --git a/vendors/ocaml-secp256k1/test/jbuild b/vendors/ocaml-secp256k1/test/dune
similarity index 100%
rename from vendors/ocaml-secp256k1/test/jbuild
rename to vendors/ocaml-secp256k1/test/dune
diff --git a/vendors/ocaml-uecc/src/jbuild b/vendors/ocaml-uecc/src/dune
similarity index 100%
rename from vendors/ocaml-uecc/src/jbuild
rename to vendors/ocaml-uecc/src/dune
diff --git a/vendors/ocaml-uecc/test/jbuild b/vendors/ocaml-uecc/test/dune
similarity index 100%
rename from vendors/ocaml-uecc/test/jbuild
rename to vendors/ocaml-uecc/test/dune
diff --git a/vendors/ocplib-json-typed/jbuild b/vendors/ocplib-json-typed/dune
similarity index 100%
rename from vendors/ocplib-json-typed/jbuild
rename to vendors/ocplib-json-typed/dune
diff --git a/vendors/ocplib-json-typed/lib_json_typed/jbuild b/vendors/ocplib-json-typed/lib_json_typed/dune
similarity index 100%
rename from vendors/ocplib-json-typed/lib_json_typed/jbuild
rename to vendors/ocplib-json-typed/lib_json_typed/dune
diff --git a/vendors/ocplib-json-typed/lib_json_typed_browser/jbuild b/vendors/ocplib-json-typed/lib_json_typed_browser/dune
similarity index 100%
rename from vendors/ocplib-json-typed/lib_json_typed_browser/jbuild
rename to vendors/ocplib-json-typed/lib_json_typed_browser/dune
diff --git a/vendors/ocplib-json-typed/lib_json_typed_bson/jbuild b/vendors/ocplib-json-typed/lib_json_typed_bson/dune
similarity index 100%
rename from vendors/ocplib-json-typed/lib_json_typed_bson/jbuild
rename to vendors/ocplib-json-typed/lib_json_typed_bson/dune
diff --git a/vendors/ocplib-resto/jbuild b/vendors/ocplib-resto/dune
similarity index 100%
rename from vendors/ocplib-resto/jbuild
rename to vendors/ocplib-resto/dune
diff --git a/vendors/ocplib-resto/lib_ezresto-directory/jbuild b/vendors/ocplib-resto/lib_ezresto-directory/dune
similarity index 100%
rename from vendors/ocplib-resto/lib_ezresto-directory/jbuild
rename to vendors/ocplib-resto/lib_ezresto-directory/dune
diff --git a/vendors/ocplib-resto/lib_ezresto-directory/test/jbuild b/vendors/ocplib-resto/lib_ezresto-directory/test/dune
similarity index 100%
rename from vendors/ocplib-resto/lib_ezresto-directory/test/jbuild
rename to vendors/ocplib-resto/lib_ezresto-directory/test/dune
diff --git a/vendors/ocplib-resto/lib_ezresto/jbuild b/vendors/ocplib-resto/lib_ezresto/dune
similarity index 100%
rename from vendors/ocplib-resto/lib_ezresto/jbuild
rename to vendors/ocplib-resto/lib_ezresto/dune
diff --git a/vendors/ocplib-resto/lib_resto-cohttp/jbuild b/vendors/ocplib-resto/lib_resto-cohttp/dune
similarity index 100%
rename from vendors/ocplib-resto/lib_resto-cohttp/jbuild
rename to vendors/ocplib-resto/lib_resto-cohttp/dune
diff --git a/vendors/ocplib-resto/lib_resto-directory/jbuild b/vendors/ocplib-resto/lib_resto-directory/dune
similarity index 100%
rename from vendors/ocplib-resto/lib_resto-directory/jbuild
rename to vendors/ocplib-resto/lib_resto-directory/dune
diff --git a/vendors/ocplib-resto/lib_resto-directory/test/jbuild b/vendors/ocplib-resto/lib_resto-directory/test/dune
similarity index 100%
rename from vendors/ocplib-resto/lib_resto-directory/test/jbuild
rename to vendors/ocplib-resto/lib_resto-directory/test/dune
diff --git a/vendors/ocplib-resto/lib_resto-json/jbuild b/vendors/ocplib-resto/lib_resto-json/dune
similarity index 100%
rename from vendors/ocplib-resto/lib_resto-json/jbuild
rename to vendors/ocplib-resto/lib_resto-json/dune
diff --git a/vendors/ocplib-resto/lib_resto/jbuild b/vendors/ocplib-resto/lib_resto/dune
similarity index 100%
rename from vendors/ocplib-resto/lib_resto/jbuild
rename to vendors/ocplib-resto/lib_resto/dune