diff --git a/CHANGELOG b/CHANGELOG
index b398f16..c3c06bd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -51,6 +51,7 @@ xx/xx/2018 autofs-5.1.5
 - optionally log mount requestor process info.
 - log mount call arguments if mount_verbose is set.
 - make expire remaining log level debug.
+- allow period following macro in selector value.
 
 19/12/2017 autofs-5.1.4
 - fix spec file url.
diff --git a/modules/amd_tok.l b/modules/amd_tok.l
index cb1ebf7..36fc04b 100644
--- a/modules/amd_tok.l
+++ b/modules/amd_tok.l
@@ -95,7 +95,7 @@ V6MASK		(12[0-8]|1[0-1][0-9]|[1-9][0-9]|[1-9])
 
 FOPT		(({QSTR}|{FSTR}|{MACRO})+)
 OPTS		({OSTR}(=({VSTR}|{MACRO})+)?)
-SOPT		(({SSTR}|{QSTR}|{MACRO})+)
+SOPT		({SSTR}|{QSTR}|{MACRO}(\.|{SSTR}|{QSTR}|{MACRO})+)
 NOPT		({SSTR}|(({IP4ADDR}(\/{V4MASK})?)|({IP6ADDR}(\/{V6MASK})?)))
 
 MAPOPT		(fs|type|maptype|pref|sublink|cache)