diff --git a/infer/src/.merlin b/infer/src/.merlin
index 217b7441d..60c609a0c 100644
--- a/infer/src/.merlin
+++ b/infer/src/.merlin
@@ -1,27 +1,89 @@
 B _build/default
 B _build/default/atd
 B _build/default/istd
+FLG -principal -safe-string -short-paths -strict-formats -strict-sequence
+FLG -w +a-4-9-40-41-42-44-45-48-60
+FLG -open InferStdlib -open InferGenerated -open InferModules -open IStd
 PKG ANSITerminal
+PKG atd
 PKG atdgen
 PKG base
+PKG base.caml
+PKG base.shadow_stdlib
+PKG bigarray
+PKG bin_prot
+PKG bin_prot.shape
+PKG biniou
+PKG bytes
+PKG camlzip
+PKG camomile
 PKG cmdliner
+PKG compiler-libs
+PKG compiler-libs.bytecomp
+PKG compiler-libs.common
+PKG compiler-libs.toplevel
 PKG core
+PKG core_kernel
+PKG core_kernel.base_for_tests
+PKG easy-format
+PKG extlib
+PKG fieldslib
+PKG findlib.internal
+PKG findlib.top
+PKG jane-street-headers
 PKG javalib
+PKG lambda-term
+PKG lwt
+PKG lwt.log
+PKG lwt.react
+PKG lwt.unix
 PKG mtime
 PKG mtime.clock.os
+PKG num
+PKG num.core
 PKG oUnit
+PKG oUnit.advanced
 PKG parmap
 PKG ppx_compare
 PKG ptrees
+PKG react
+PKG result
 PKG sawja
+PKG sexplib
+PKG sexplib.0
+PKG sexplib.unix
 PKG spawn
 PKG sqlite3
+PKG stdio
 PKG str
+PKG threads
+PKG threads.posix
+PKG typerep
 PKG unix
+PKG utop
+PKG variantslib
 PKG xmlm
 PKG yojson
+PKG zed
 PKG zip
-FLG -principal -safe-string -short-paths -strict-formats -strict-sequence
-FLG -w +a-4-9-40-41-42-44-45-48-60
-FLG -open InferStdlib -open InferGenerated -open InferModules -open IStd
-S **
+S .
+S IR
+S absint
+S atd
+S backend
+S base
+S bufferoverrun
+S checkers
+S clang
+S concurrency
+S eradicate
+S facebook
+S harness
+S integration
+S istd
+S java
+S labs
+S python
+S quandary
+S unit
+S unit/clang
diff --git a/infer/src/jbuild.in b/infer/src/jbuild.in
index df16c9c9e..a15e85c1a 100644
--- a/infer/src/jbuild.in
+++ b/infer/src/jbuild.in
@@ -77,12 +77,11 @@ let stanzas =
   (flags (%s))
   (ocamlopt_flags (%s))
   (libraries (utop InferModules))
-  (modules (:standard \ %s))
+  (modules (Infertop))
   (link_flags (-linkall -warn-error -31))))
 |}
         (String.concat " " infer_cflags)
-        (String.concat " " common_optflags)
-        (String.concat " " infer_binaries) ]
+        (String.concat " " common_optflags) ]
   @ ( List.map
         (fun source_dir ->
           [ Printf.sprintf "(copy_files# %s/*.ml{,i,l})" source_dir