diff --git a/libwccl/parser/grammar.g b/libwccl/parser/grammar.g
index 781ed05631b96548af6c33b79f5f078897a86bab..c98b8501d9d03e337c65385fd0ed7357089b0ea7 100644
--- a/libwccl/parser/grammar.g
+++ b/libwccl/parser/grammar.g
@@ -1056,10 +1056,15 @@ ML_COMMENT
 options {
 	paraphrase = "Multi line comment";
 }
-	: "/*"
-	  (.)*
-	  "*/"
-	{ $setType(antlr::Token::SKIP);  } 
+  : "/*"
+    ({ LA(2)!='/' }? '*'
+      | ('\r' '\n') => '\r' '\n' {newline();}
+      | '\r' {newline();}
+      | '\n' {newline();}
+      | ~('*'|'\n'|'\r')
+    )*
+    "*/"
+    {$setType(antlr::Token::SKIP);}
 ;
 
 HASH