diff --git a/2048/.frama-c/GNUmakefile b/2048/.frama-c/GNUmakefile
index 9f80274ba6fe9a324c36ddefcbd149a13bcc091a..b8f3067a5cb5d2805ce165e6c1caf66a8a975a4d 100644
--- a/2048/.frama-c/GNUmakefile
+++ b/2048/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/basic-cwe-examples/.frama-c/GNUmakefile b/basic-cwe-examples/.frama-c/GNUmakefile
index 43ba37a86ec24619b3ed01a3e02d0fa08d157aa4..f45703696663f000be2d9744eee1f6584f8719a8 100644
--- a/basic-cwe-examples/.frama-c/GNUmakefile
+++ b/basic-cwe-examples/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_64
 
@@ -20,7 +20,7 @@ FCFLAGS     += \
   -kernel-warn-key annot:missing-spec=abort \
   -kernel-warn-key typing:implicit-function-declaration=abort \
 
-# (Optional) Eva-specific flags
+## Eva-specific flags
 EVAFLAGS    += \
   -eva-warn-key builtins:missing-spec=abort \
 
diff --git a/bench-moerman2018/.frama-c/GNUmakefile b/bench-moerman2018/.frama-c/GNUmakefile
index 467b17bdeacb4158dd3cc9489462ffc9a694daa8..50723d26521a5205020b22349a44e61d89a4e2d9 100644
--- a/bench-moerman2018/.frama-c/GNUmakefile
+++ b/bench-moerman2018/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/cerberus/.frama-c/GNUmakefile b/cerberus/.frama-c/GNUmakefile
index e9dd64cd3a7ca4f12c56d6ee0a8380ea34425f9a..0d3ae7b9fedc8bf8a8461e71f2a31c4c0beebf20 100644
--- a/cerberus/.frama-c/GNUmakefile
+++ b/cerberus/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/chrony/.frama-c/GNUmakefile b/chrony/.frama-c/GNUmakefile
index 9ac960ac85f70e4140007ff4b3c8972cea1896d7..98bcf482847f1a9aa4d5290bc70e0bdfebbc7577 100644
--- a/chrony/.frama-c/GNUmakefile
+++ b/chrony/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_64
 
diff --git a/debie1/.frama-c/GNUmakefile b/debie1/.frama-c/GNUmakefile
index b167572484dca0e0c897ada2df6061dba8e977ee..387f93ab253b7a0a186f56a916b180b9092751a8 100644
--- a/debie1/.frama-c/GNUmakefile
+++ b/debie1/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/gzip124/.frama-c/GNUmakefile b/gzip124/.frama-c/GNUmakefile
index 8cad950b81f4f2e65f28f7dedff8c4146523bfc7..415e0b128a3cb5c743f858147f323577308c001a 100644
--- a/gzip124/.frama-c/GNUmakefile
+++ b/gzip124/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/hiredis/.frama-c/GNUmakefile b/hiredis/.frama-c/GNUmakefile
index 73d9fb4473038e06ba2923c1f17883810df4b136..b0437279bee53133a1b8dea3885e14dccba6054f 100644
--- a/hiredis/.frama-c/GNUmakefile
+++ b/hiredis/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 FRAMAC_SHARE = $(shell $(FRAMAC)-config -print-share-path)
 
diff --git a/icpc/.frama-c/GNUmakefile b/icpc/.frama-c/GNUmakefile
index b64b6cf36d8f6e0d4dc229d2faf9eb9830d046a0..c6325cc01af47a275e4ad6047e896550c7469958 100644
--- a/icpc/.frama-c/GNUmakefile
+++ b/icpc/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/itc-benchmarks/.frama-c/GNUmakefile b/itc-benchmarks/.frama-c/GNUmakefile
index 81f962bbfbf1083db30f7b4fc0e7412007f5a4c5..bb7cf9478862ed911a7de744966c9335f471bfe6 100644
--- a/itc-benchmarks/.frama-c/GNUmakefile
+++ b/itc-benchmarks/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/jsmn/.frama-c/GNUmakefile b/jsmn/.frama-c/GNUmakefile
index 12f4cd6799dc780c07ec865af932f937ace98424..3455a3bbdb8aba33c3bc3411423a6b38d9dd4c46 100644
--- a/jsmn/.frama-c/GNUmakefile
+++ b/jsmn/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/khash/.frama-c/GNUmakefile b/khash/.frama-c/GNUmakefile
index 50e1f662ba9ebfeb0448951f6b2cc14f82334307..e6ef098b168543450a7b982cca5ac6d823a5ce99 100644
--- a/khash/.frama-c/GNUmakefile
+++ b/khash/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/kilo/.frama-c/GNUmakefile b/kilo/.frama-c/GNUmakefile
index 5d2dc60054d4d0f33f694af502e1fa51a04d53b4..ce1e6915dbfda94999e65450df4215504093def4 100644
--- a/kilo/.frama-c/GNUmakefile
+++ b/kilo/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/libmodbus/.frama-c/GNUmakefile b/libmodbus/.frama-c/GNUmakefile
index 5dba02a68ac179002762c0c1657a49178988bc86..cddc59d3a2c18b19f64ad7fd20ba8aade92531f0 100644
--- a/libmodbus/.frama-c/GNUmakefile
+++ b/libmodbus/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = gcc_x86_64
 
diff --git a/libspng/.frama-c/GNUmakefile b/libspng/.frama-c/GNUmakefile
index aa3c3b7572b648c639338c567ce5be2bbe1dba14..632697b61f1d320d36534e8aaf2833d26efdd0c5 100644
--- a/libspng/.frama-c/GNUmakefile
+++ b/libspng/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/microstrain/.frama-c/GNUmakefile b/microstrain/.frama-c/GNUmakefile
index 503d160aa4938ca4693f127bd8713ff05fe72df9..68c4c3661b253e9f54bb22bff4e83c68399fdf9d 100644
--- a/microstrain/.frama-c/GNUmakefile
+++ b/microstrain/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/mini-gmp/.frama-c/GNUmakefile b/mini-gmp/.frama-c/GNUmakefile
index 5857e11cc771d20f2e30920446eeaebb089c96cd..d5e835de9c06cc1e0bea6f99290f71d23c6d012d 100644
--- a/mini-gmp/.frama-c/GNUmakefile
+++ b/mini-gmp/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = gcc_x86_32
 
diff --git a/monocypher/.frama-c/GNUmakefile b/monocypher/.frama-c/GNUmakefile
index 1a383e86e2e5d4f3446836f0f477f61db47e6a85..eac2b38be88add55dc3110bd808f9890f207e36b 100644
--- a/monocypher/.frama-c/GNUmakefile
+++ b/monocypher/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_64
 
diff --git a/papabench/.frama-c/GNUmakefile b/papabench/.frama-c/GNUmakefile
index 58a645b41024ad4de5fe680a34157b48c973ea98..c07aa38c4a0fa9870c45e329cc97ca613240973c 100644
--- a/papabench/.frama-c/GNUmakefile
+++ b/papabench/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/polarssl/.frama-c/GNUmakefile b/polarssl/.frama-c/GNUmakefile
index c7a08fbb3a0bbe57c29c7dc11bbcf0190f6cb311..dbc71f4a540eaeb630e74ae34a890cd5ce11be9b 100644
--- a/polarssl/.frama-c/GNUmakefile
+++ b/polarssl/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/qlz/.frama-c/GNUmakefile b/qlz/.frama-c/GNUmakefile
index a2114475764d2e685b24c72eb54f11c6574bb609..39eb2fd7da151b93ef0a574648662c4805c8169e 100644
--- a/qlz/.frama-c/GNUmakefile
+++ b/qlz/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/safestringlib/.frama-c/GNUmakefile b/safestringlib/.frama-c/GNUmakefile
index d27ba2a43365229b3d063bf2a9aa2cedbe894c04..da255ca3350f61808b313065005bc3d2043db9fb 100644
--- a/safestringlib/.frama-c/GNUmakefile
+++ b/safestringlib/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/semver/.frama-c/GNUmakefile b/semver/.frama-c/GNUmakefile
index b39dd07a39a1e6264da1c1c4ded76ad8426c4db1..00d3e5d86f8b256fbb5641dbdb4e3838e4ff6123 100644
--- a/semver/.frama-c/GNUmakefile
+++ b/semver/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/solitaire/.frama-c/GNUmakefile b/solitaire/.frama-c/GNUmakefile
index 08cddcc97182961363995d11a40a0db68dc927b9..10fb4609e9e89d45906a470426bdfcfcebeb7261 100644
--- a/solitaire/.frama-c/GNUmakefile
+++ b/solitaire/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/tweetnacl-usable/.frama-c/GNUmakefile b/tweetnacl-usable/.frama-c/GNUmakefile
index 28a52f92136289dc58ca5ab3df65b437a6aab28e..3cbb8045cc8d52786a7a1f6192811cb0815ee7c8 100644
--- a/tweetnacl-usable/.frama-c/GNUmakefile
+++ b/tweetnacl-usable/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_32
 
diff --git a/x509-parser/.frama-c/GNUmakefile b/x509-parser/.frama-c/GNUmakefile
index e165e629da707e254535f93976aeceb06339ee96..f928199fa2ba487f7cfd25892f0ae2d31d52e83b 100644
--- a/x509-parser/.frama-c/GNUmakefile
+++ b/x509-parser/.frama-c/GNUmakefile
@@ -7,7 +7,7 @@ FRAMAC ?= frama-c
 include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
-# Edit below as needed. MACHDEP is mandatory. Suggested flags are optional.
+# Edit below as needed. Suggested flags are optional.
 
 MACHDEP = x86_64