diff --git a/CHANGELOG b/CHANGELOG
index e42bf42..c41dc39 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -49,6 +49,7 @@
 - make "-hosts" module try to be sensitive to exports list changes.
 - change mount "device" from "automount" to the map name.
 - check for buffer overflow in mount_afs.c.
+- update master map tokenizer to admit "slasify-colons" option (Capelle Bonoit).
 
 1/9/2006 autofs-5.0.1 rc2
 -------------------------
diff --git a/lib/master_tok.l b/lib/master_tok.l
index dc76c5c..84239c1 100644
--- a/lib/master_tok.l
+++ b/lib/master_tok.l
@@ -92,6 +92,7 @@ CONT		\\\n{OPTWS}
 
 OPTIONSTR	([\-]?([[:alpha:]_]([[:alnum:]_\-])*(=([[:alnum:]_\-])+)*)+)
 MACROSTR	(-D{OPTWS}([[:alpha:]_]([[:alnum:]_\-])*)=([[:alnum:]_\-])+)
+SLASHIFYSTR	(--(no-)?slashify-colons)
 NUMBER		[0-9]+
 
 DNSERVSTR1	([[:alpha:]][[:alnum:]\-.]*(:[0-9]+)?:)
@@ -307,6 +308,11 @@ OPTTOUT		(-t{OPTWS}|-t{OPTWS}={OPTWS}|--
 
 	{OPTWS} {}
 
+	{SLASHIFYSTR} {
+		strcpy(master_lval.strtype, master_text);
+		return(OPTION);
+	}
+
 	{MACROSTR} {
 		strcpy(master_lval.strtype, master_text);
 		return(OPTION);