diff --git a/fr/Makefile b/fr/Makefile
index d1bcb1d1a54701eddc79170507718d53ce03d830..8519420d1e0fb696e0be2a6137e264f2fe56b054 100644
--- a/fr/Makefile
+++ b/fr/Makefile
@@ -8,6 +8,7 @@ compile:
 	$(MAKE) -C maca_lexer compile
 	$(MAKE) -C maca_trans_tagger compile
 	$(MAKE) -C maca_trans_morpho compile
+	$(MAKE) -C maca_trans_lemmatizer compile
 	$(MAKE) -C maca_trans_parser compile
 #	$(MAKE) -C maca_trans_parser_nn compile
 #	$(MAKE) -C maca_crf_tagger compile
@@ -18,7 +19,7 @@ install:
 	$(MAKE) -C maca_trans_morpho install
 	$(MAKE) -C maca_trans_parser install
 #	$(MAKE) -C maca_trans_parser_nn install
-	$(MAKE) -C maca_lemmatizer install
+	$(MAKE) -C maca_trans_lemmatizer install
 	$(MAKE) -C maca_lexer install
 #	$(MAKE) -C maca_crf_tagger install
 #	@tar -cvzf ./maca_datas.tgz bin
@@ -33,6 +34,7 @@ clean:
 	$(MAKE) -C maca_trans_parser clean
  #	$(MAKE) -C maca_trans_parser_nn clean
 	$(MAKE) -C maca_trans_morpho clean
+	$(MAKE) -C maca_trans_lemmatizer clean
 	$(MAKE) -C maca_trans_tagger clean
 	$(MAKE) -C maca_crf_tagger clean
 	$(MAKE) -C eval clean
diff --git a/fr/maca_lemmatizer/Makefile b/fr/maca_lemmatizer/Makefile
deleted file mode 100644
index 05e1e78725cbd3f45dfc084675d3c2f2c0b7ffd4..0000000000000000000000000000000000000000
--- a/fr/maca_lemmatizer/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-DATA=../data/morpho-lexicon
-THRESHOLD=100
-STRICT=-s
-
-##-----------------------------------------------------------------------
-## compile
-##-----------------------------------------------------------------------
-
-model : cff
-	perceptron_train --cff $< --model model -n 4
-
-cff: rules
-	maca_trans_lemmatizer_mcf2cff -f exceptions.fplm -x cff -i ../data/treebank/train.mcf -F maca_trans_lemmatizer.fm -V dico
-
-rules:
-	maca_compute_l_rules -f ../data/morpho-lexicon/fplm -e exceptions.fplm -r rules $(STRICT) -t $(THRESHOLD)
-
-##-----------------------------------------------------------------------
-## install
-##-----------------------------------------------------------------------
-
-install:
-	- cp $(DATA)/fplm ../bin
-
-##-----------------------------------------------------------------------
-## clean
-##-----------------------------------------------------------------------
-
-clean:
-	-rm rules
-	-rm exceptions.fplm
-	-rm cff
-	-rm model
diff --git a/fr/maca_trans_lemmatizer/Makefile b/fr/maca_trans_lemmatizer/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..bd188652b86fb1c954c6d325a5e96acb13157600
--- /dev/null
+++ b/fr/maca_trans_lemmatizer/Makefile
@@ -0,0 +1,15 @@
+MCF_TRAIN=../data/treebank/train.mcf
+MCF_DEV=../data/treebank/dev.mcf
+MCF_TEST=../data/treebank/test.mcf
+CFF_TRAIN=train.cff
+MODEL_FILENAME=maca_trans_lemmatizer.model 
+RULES_FILENAME=maca_trans_lemmatizer_rules.txt
+EXCEPTIONS_FPLM_FILENAME=maca_trans_lemmatizer_exceptions.fplm
+VOCABS_FILENAME=maca_trans_lemmatizer.vocab 
+FEATURES_MODEL_FILENAME=maca_trans_lemmatizer.fm
+FPLM_FILENAME=../data/morpho-lexicon/fplm
+THRESHOLD=50
+STRICT=-s
+
+
+include ../../makefiles/maca_trans_lemmatizer.makefile
diff --git a/fr/maca_lemmatizer/maca_trans_lemmatizer.fm b/fr/maca_trans_lemmatizer/maca_trans_lemmatizer.fm
similarity index 58%
rename from fr/maca_lemmatizer/maca_trans_lemmatizer.fm
rename to fr/maca_trans_lemmatizer/maca_trans_lemmatizer.fm
index f470bfd7cc885f3ee2d7be6b64fe347103ae1e6c..ddeb05b623beeff53b9498d0b3b13e898d7b01db 100644
--- a/fr/maca_lemmatizer/maca_trans_lemmatizer.fm
+++ b/fr/maca_trans_lemmatizer/maca_trans_lemmatizer.fm
@@ -17,5 +17,12 @@
 #b0s4
 #b0s5
 b0p b0s1 b0s2
+b0p b0s2 b0s3
+b0p b0s3 b0s4
+b0p b0s4 b0s5
+b0p b0s5 b0s6
+b0p b0s1 b0s2
 b0p b0s1 b0s2 b0s3
 b0p b0s1 b0s2 b0s3 b0s4
+b0p b0s1 b0s2 b0s3 b0s4 b0s5
+b0p b0s1 b0s2 b0s3 b0s4 b0s5 b0s6
diff --git a/makefiles/maca_trans_lemmatizer.makefile b/makefiles/maca_trans_lemmatizer.makefile
new file mode 100644
index 0000000000000000000000000000000000000000..bdd03ff9e1f0db0687d05de441e879a5052be940
--- /dev/null
+++ b/makefiles/maca_trans_lemmatizer.makefile
@@ -0,0 +1,36 @@
+##-----------------------------------------------------------------------
+## compile
+##-----------------------------------------------------------------------
+
+compile: $(MODEL_FILENAME)
+
+$(RULES_FILENAME):
+	maca_compute_l_rules -f $(FPLM_FILENAME) -e $(EXCEPTIONS_FPLM_FILENAME) -r $(RULES_FILENAME) $(STRICT) -t $(THRESHOLD)
+
+$(CFF_TRAIN): $(RULES_FILENAME)
+	maca_trans_lemmatizer_mcf2cff -w $(EXCEPTIONS_FPLM_FILENAME) -x $(CFF_TRAIN) -i $(MCF_TRAIN) -F $(FEATURES_MODEL_FILENAME) -V $(VOCABS_FILENAME) -l $(RULES_FILENAME)
+
+$(MODEL_FILENAME) : $(CFF_TRAIN)
+	perceptron_train --cff $< --model $(MODEL_FILENAME) -n 4
+
+##-----------------------------------------------------------------------
+## install
+##-----------------------------------------------------------------------
+
+install:
+	- cp $(RULES_FILENAME) ../bin
+	- cp $(FEATURES_MODEL_FILENAME) ../bin
+	- cp $(MODEL_FILENAME) ../bin
+	- cp $(EXCEPTIONS_FPLM_FILENAME) ../bin
+	- cp $(VOCABS_FILENAME) ../bin
+
+##-----------------------------------------------------------------------
+## clean
+##-----------------------------------------------------------------------
+
+clean:
+	-rm $(RULES_FILENAME)
+	-rm $(EXCEPTIONS_FPLM_FILENAME)
+	-rm $(TRAIN_CFF)
+	-rm $(MODEL_FILENAME)
+	-rm $(VOCABS_FILENAME)