diff --git a/compiler/.merlin b/compiler/.merlin
new file mode 100644
index 0000000..409f7d8
--- /dev/null
+++ b/compiler/.merlin
@@ -0,0 +1,41 @@
+B _build
+B _build/global
+B _build/heptagon
+B _build/heptagon/analysis
+B _build/heptagon/main
+B _build/heptagon/parsing
+B _build/heptagon/transformations
+B _build/main
+B _build/minils
+B _build/minils/analysis
+B _build/minils/main
+B _build/minils/sigali
+B _build/minils/transformations
+B _build/obc
+B _build/obc/c
+B _build/obc/java
+B _build/obc/main
+B _build/obc/transformations
+S global
+S heptagon
+S heptagon/analysis
+S heptagon/ctrln
+S heptagon/main
+S heptagon/parsing
+S heptagon/transformations
+S main
+S minils
+S minils/analysis
+S minils/ctrln
+S minils/main
+S minils/sigali
+S minils/transformations
+S obc
+S obc/c
+S obc/java
+S obc/main
+S obc/transformations
+S utilities
+S utilities/ctrln
+S utilities/global
+S utilities/minils
diff --git a/compiler/_tags.in b/compiler/_tags.in
index 6f853a5..4864b5e 100644
--- a/compiler/_tags.in
+++ b/compiler/_tags.in
@@ -2,6 +2,7 @@
 <**/*.ml*>: debug, dtypes, package(ocamlgraph)
 <preproc.ml>: camlp4of, package(camlp4)
 true: use_menhir
+true: annot, bin_annot
 
 <**/*.{byte,native,[dp].byte,[dp].native}>: package(unix), package(str)
 <**/heptc.{byte,native,[dp].byte,[dp].native}>: package(menhirLib), package(ocamlgraph)