diff --git a/Makefile b/Makefile
index 9772c4e2..36e10466 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
 NAME := jbuilder
 
-# Default rule
-default:
-	ocaml build.ml
+default: boot.exe
+	./boot.exe -j 4
+
+boot.exe: bootstrap.ml
+	ocaml bootstrap.ml
 
 install:
 	opam-installer -i --prefix $(PREFIX) jbuilder.install
diff --git a/build.ml b/bootstrap.ml
similarity index 98%
rename from build.ml
rename to bootstrap.ml
index f9db94a6..72b9a718 100644
--- a/build.ml
+++ b/bootstrap.ml
@@ -307,8 +307,3 @@ let () =
           ())
   in
   if n <> 0 then exit n
-
-let () =
-  exit
-    (exec "%s"
-       (String.concat ~sep:" " ("./boot.exe" :: (List.tl (Array.to_list Sys.argv)))))
diff --git a/jbuilder.opam b/jbuilder.opam
index 3ae24a99..31ba7108 100644
--- a/jbuilder.opam
+++ b/jbuilder.opam
@@ -6,7 +6,8 @@ bug-reports: "https://github.com/janestreet/jbuilder/issues"
 dev-repo: "https://github.com/janestreet/jbuilder.git"
 license: "Apache-2.0"
 build: [
-["ocaml" "build.ml" "-j" jobs]
+  ["ocaml" "bootstrap.ml"]
+  ["./boot.exe" "-j" jobs]
 ]
 available: [ ocaml-version >= "4.03.0" ]
 descr: "