diff --git a/glcpp-lex.l b/glcpp-lex.l
index 3c9dda46d47..97ff1175f1b 100644
--- a/glcpp-lex.l
+++ b/glcpp-lex.l
@@ -39,7 +39,7 @@ SPACE		[[:space:]]
 NONSPACE	[^[:space:]]
 NEWLINE		[\n]
 HSPACE		[ \t]
-HASH		^{HSPACE}*#
+HASH		^{HSPACE}*#{HSPACE}*
 IDENTIFIER	[_a-zA-Z][_a-zA-Z0-9]*
 TOKEN		[^[:space:](),]+
 
@@ -109,6 +109,6 @@ TOKEN		[^[:space:](),]+
 	return NEWLINE;
 }
 
-{SPACE}+
+{HSPACE}+
 
 %%