diff --git a/lib/master_tok.l b/lib/master_tok.l
index 00cd223..48bc233 100644
--- a/lib/master_tok.l
+++ b/lib/master_tok.l
@@ -109,6 +109,7 @@ AT_O		([oO])
 AT_C		([cC])
 DNATTRSTR	{AT_CN}|{AT_NMN}|{AT_AMN}|{AT_OU}|{AT_DC}|{AT_O}|{AT_C}
 DNNAMESTR	([[:alnum:]_.\-]+)
+DNNAMETRM	(,|{WS}{NL}|{WS}#.*|\x00)
 
 INTMAP		(-hosts|-null)
 MULTI		((multi)(,(sun|hesiod))?(:{OPTWS}|{WS}))
@@ -281,7 +282,7 @@ OPTTOUT		(-t{OPTWS}|-t{OPTWS}={OPTWS}|--timeout{OPTWS}|--timeout{OPTWS}={OPTWS})
 		return EQUAL;
 	}
 
-	{DNNAMESTR} {
+	{DNNAMESTR}/{DNNAMETRM} {
 		strcpy(master_lval.strtype, master_text);
 		return DNNAME;
 	}