diff --git a/src/plugins/e-acsl/Makefile.in b/src/plugins/e-acsl/Makefile.in
index 6a726454549f6cea7376fb8ae1ae96559285d089..137e7566d6a7509d8cb6f50c5282b3a651b0e7bd 100644
--- a/src/plugins/e-acsl/Makefile.in
+++ b/src/plugins/e-acsl/Makefile.in
@@ -218,29 +218,6 @@ headers::
 		Makefile.in configure.ac \
 		share/e-acsl/*.[ch] share/e-acsl/*/*.[ch]
 
-##########
-# Merlin #
-##########
-
-FRAMAC_SRC?=$(FRAMAC_TOP_SRCDIR)
-
-$(PLUGIN_DIR)/.merlin: $(PLUGIN_DIR)/Makefile
-	echo "FLG $(FRAMAC_USER_MERLIN_FLAGS)" > $@
-	find `echo "$(FRAMAC_SRC)/src" | xargs -n 1 -d ' ' readlink -f` \( -name .svn -o -name tests -o -name doc -o -name result -o -name -o -name oracle -o -name "*.cache" -o -name .git \) -prune -o \( -type d -printf "S %p\n"  \) >> $@
-ifeq ("$(FRAMAC_MAKE)","yes")
-# internal compilation: do not assume kernel files are already installed
-	find `echo "$(FRAMAC_SRC)/src" | xargs -n 1 -d ' ' readlink -f` \( -name .svn -o -name tests -o -name doc -o -name result -o -name -o -name oracle -o -name "*.cache" -o -name .git \) -prune -o \( -type d -printf "B %p\n"  \) >> $@
-
-else
-	echo "B $(FRAMAC_LIBDIR)" >> $@
-endif
-	echo $(OCAMLGRAPH_MERLIN) >> $@
-	echo "PKG findlib" >> $@
-	echo "PKG zarith" >> $@
-	echo "PKG lablgtk2" >> $@
-
-merlin: $(PLUGIN_DIR)/.merlin
-
 ################
 # Generic part #
 ################
diff --git a/src/plugins/e-acsl/TODO b/src/plugins/e-acsl/TODO
index 49e5baf642c49f51f7373806fda1ecde2605ab4c..e3029630f0b9159dfb07f3196588ee73f21a2f1c 100644
--- a/src/plugins/e-acsl/TODO
+++ b/src/plugins/e-acsl/TODO
@@ -14,6 +14,7 @@
   sujet
 - [Tout le monde] scripts de compilation du programme généré
 - [Enseignement] assigns
+- multithreading
 
 =====
 - Voir avec Guillaume et Nikolaï ce dont ils ont besoin comme API pour faire