diff --git a/parse.lex b/parse.lex
index 7f4469c09..2d57784cd 100644
--- a/parse.lex
+++ b/parse.lex
@@ -76,7 +76,8 @@ extern void yyerror		__P((char *));
 #endif
 %}
 
-N			[0-9][0-9]?[0-9]?
+OCTET			[0-9][0-9]?[0-9]?
+WORD			[a-zA-Z0-9_-]+
 
 %e	4000
 %p	6000
@@ -158,11 +159,18 @@ N			[0-9][0-9]?[0-9]?
 			    return(USERGROUP);
 			 }
 
-{N}\.{N}\.{N}\.{N}	{
+{OCTET}(\.{OCTET}){3}	{
 			    fill(yytext, yyleng);
+			    LEXTRACE("NTWKADDR ");
 			    return(NTWKADDR);
 			}
 
+{WORD}(\.{WORD})+	{
+			    fill(yytext, yyleng);
+			    LEXTRACE("FQHOST ");
+			    return(FQHOST);
+			}
+
 \/[^\,:=\\ \t\n#]+	{
 			    /* directories can't have args... */
 			    if (yytext[yyleng - 1] == '/') {