diff --git a/bootstrap.ml b/bootstrap.ml
index bc06d254..c40f54d1 100644
--- a/bootstrap.ml
+++ b/bootstrap.ml
@@ -265,6 +265,32 @@ module Jbuilder_re = struct
   end
 end
 
+module Jbuilder_opam_file_format = struct
+  module OpamParserTypes = struct
+    type value =
+      | String of unit * string
+      | List of unit * value list
+      | Other
+
+    type opamfile_item =
+      | Variable of unit * string * value
+      | Other
+
+    type opamfile =
+      { file_contents : opamfile_item list
+      ; file_name     : string
+      }
+  end
+  module OpamParser = struct
+    open OpamParserTypes
+    let file fn =
+      assert (fn = "jbuilder.opam");
+      { file_contents = []
+      ; file_name     = fn
+      }
+  end
+end
+
 module Glob_lexer = struct
   let parse_string _ = failwith "globs are not available during bootstrap"
 end
diff --git a/src/main.ml b/src/main.ml
index b682bfa6..a43847f4 100644
--- a/src/main.ml
+++ b/src/main.ml
@@ -160,7 +160,8 @@ let bootstrap () =
   let main () =
     let anon s = raise (Arg.Bad (Printf.sprintf "don't know what to do with %s\n" s)) in
     let subst () =
-      Future.Scheduler.go (Watermarks.subst ~package:"jbuilder")
+      Future.Scheduler.go (Watermarks.subst ~package:"jbuilder");
+      exit 0
     in
     Arg.parse
       [ "-j"           , Set_int Clflags.concurrency, "JOBS concurrency"