diff --git a/.gitignore b/.gitignore
index f1484e4f8..1b4638a24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,7 +160,6 @@ infer/src/.project
 /infer/src/istd/jbuild
 /infer/src/scripts/jbuild
 /infer/src/jbuild-workspace
-.merlin
 
 # generated when looking for dead code
 /infer/src/deadcode/.depend
diff --git a/infer/src/llvm/.merlin b/infer/src/.merlin
similarity index 68%
rename from infer/src/llvm/.merlin
rename to infer/src/.merlin
index d7f5a51c9..2e2a0a7bc 100644
--- a/infer/src/llvm/.merlin
+++ b/infer/src/.merlin
@@ -1,10 +1,10 @@
-B ../_build/default/.InferModules.objs
-B ../_build/default/.infer.eobjs
-B ../_build/default/.infertop.eobjs
-B ../_build/default/atd/.InferGenerated.objs
-B ../_build/default/base/.InferBase.objs
-B ../_build/default/IR/.InferIR.objs
-B ../_build/default/istd/.InferStdlib.objs
+B _build/default/.InferModules.objs
+B _build/default/.infer.eobjs
+B _build/default/.infertop.eobjs
+B _build/default/atd/.InferGenerated.objs
+B _build/default/base/.InferBase.objs
+B _build/default/IR/.InferIR.objs
+B _build/default/istd/.InferStdlib.objs
 FLG -principal -safe-string -short-paths -strict-formats -strict-sequence
 FLG -w +a-4-9-40-41-42-44-45-48-60
 FLG -open Core -open InferStdlib -open InferGenerated -open InferModules -open IStd -open InferBase -open InferIR
@@ -38,6 +38,7 @@ PKG findlib.top
 PKG jane-street-headers
 PKG javalib
 PKG lambda-term
+PKG llair
 PKG lwt
 PKG lwt.log
 PKG lwt.react
@@ -72,22 +73,22 @@ PKG yojson
 PKG zed
 PKG zip
 S .
-S ../IR
-S ../absint
-S ../atd
-S ../backend
-S ../base
-S ../bufferoverrun
-S ../checkers
-S ../clang
-S ../concurrency
-S ../eradicate
-S ../facebook
-S ../integration
-S ../istd
-S ../java
-S ../labs
-S ../python
-S ../quandary
-S ../unit
-S ../unit/clang
+S IR
+S absint
+S atd
+S backend
+S base
+S bufferoverrun
+S checkers
+S clang
+S concurrency
+S eradicate
+S facebook
+S integration
+S istd
+S java
+S labs
+S python
+S quandary
+S unit
+S unit/clang
diff --git a/infer/src/atd/.merlin b/infer/src/atd/.merlin
new file mode 100644
index 000000000..a3beae63b
--- /dev/null
+++ b/infer/src/atd/.merlin
@@ -0,0 +1,12 @@
+B ../_build/default/atd/.InferGenerated.objs
+FLG -open InferGenerated -g -short-paths -safe-string -principal -strict-formats -strict-sequence -bin-annot -w +3+5+6+8+10+11+12+18+19+20+21+23+26+29+27+32+33+34+35+37+38+39+50+52+57-4-9-40-41-42-45-48 -w -27-32-34-35-39
+PKG atd
+PKG atdgen
+PKG biniou
+PKG core
+PKG easy-format
+PKG ppx_compare
+PKG str
+PKG unix
+PKG yojson
+S .
diff --git a/infer/src/jbuild-workspace.in b/infer/src/jbuild-workspace.in
index 5d93cb1be..0487fb87d 100644
--- a/infer/src/jbuild-workspace.in
+++ b/infer/src/jbuild-workspace.in
@@ -1,3 +1,7 @@
-(context ((switch @OPAMSWITCH@) (name default) (merlin)))
+;; The .merlin generated by jbuilder gets confused about the ppx
+;; used, so for now rely on our own .merlin file.
+;; https://github.com/ocaml/dune/issues/657
+
+(context ((switch @OPAMSWITCH@) (name default)))
 (context ((switch @OPAMSWITCH@) (name opt)))
 (context ((switch @OPAMSWITCH@) (name test)))
diff --git a/infer/src/scripts/.merlin b/infer/src/scripts/.merlin
new file mode 100644
index 000000000..66ad25f01
--- /dev/null
+++ b/infer/src/scripts/.merlin
@@ -0,0 +1,6 @@
+B ../_build/default/scripts
+PKG core
+PKG str
+FLG -principal -safe-string -short-paths -strict-formats -strict-sequence
+FLG -w +a-4-9-40-41-42-44-45-48-60
+S .