diff --git a/CHANGELOG b/CHANGELOG
index 00f9cf2..c31e514 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -23,6 +23,7 @@
 - add check for labeled local filesystems (Matthias Koenig).
 - disable exports check for "-hosts" map.
 - fix memory allocation problem with global options patch.
+- fix master map lexer to admit "." in macro values (Mike Matera).
 
 20/2/2007 autofs-5.0.1
 ----------------------
diff --git a/lib/master_tok.l b/lib/master_tok.l
index a5d6066..c15ef68 100644
--- a/lib/master_tok.l
+++ b/lib/master_tok.l
@@ -89,7 +89,7 @@ NL		\r?\n
 CONT		\\\n{OPTWS}
 
 OPTIONSTR	([\-]?([[:alpha:]_]([[:alnum:]_\-])*(=([[:alnum:]_\-])+)*)+)
-MACROSTR	(-D{OPTWS}([[:alpha:]_]([[:alnum:]_\-])*)=([[:alnum:]_\-])+)
+MACROSTR	(-D{OPTWS}([[:alpha:]_]([[:alnum:]_\-])*)=([[:alnum:]_\-\.])+)
 SLASHIFYSTR	(--(no-)?slashify-colons)
 NUMBER		[0-9]+