diff --git a/lexers/embedded/gas.xml b/lexers/embedded/gas.xml
index 1ef31dec9..1feda85f7 100644
--- a/lexers/embedded/gas.xml
+++ b/lexers/embedded/gas.xml
@@ -48,10 +48,24 @@
       <rule pattern="(?:0[xX][a-zA-Z0-9]+|\d+)">
         <token type="LiteralNumberInteger"/>
       </rule>
+      <rule pattern="%(?:[a-zA-Z$_][\w$.@-]*|\.[\w$.@-]+)">
+        <token type="NameVariable"/>
+      </rule>
       <rule pattern="[\r\n]+">
         <token type="Text"/>
         <pop depth="1"/>
       </rule>
+      <rule pattern="([;#]|//).*?\n">
+        <token type="CommentSingle"/>
+        <pop depth="1"/>
+      </rule>
+      <rule pattern="/[*].*?[*]/">
+        <token type="CommentMultiline"/>
+      </rule>
+      <rule pattern="/[*].*?\n[\w\W]*?[*]/">
+        <token type="CommentMultiline"/>
+        <pop depth="1"/>
+      </rule>
       <rule>
         <include state="punctuation"/>
       </rule>
@@ -99,6 +113,17 @@
         <token type="Text"/>
         <pop depth="1"/>
       </rule>
+      <rule pattern="([;#]|//).*?\n">
+        <token type="CommentSingle"/>
+        <pop depth="1"/>
+      </rule>
+      <rule pattern="/[*].*?[*]/">
+        <token type="CommentMultiline"/>
+      </rule>
+      <rule pattern="/[*].*?\n[\w\W]*?[*]/">
+        <token type="CommentMultiline"/>
+        <pop depth="1"/>
+      </rule>
       <rule>
         <include state="punctuation"/>
       </rule>
@@ -113,9 +138,12 @@
       <rule pattern="\s+">
         <token type="Text"/>
       </rule>
-      <rule pattern="[;#].*?\n">
-        <token type="Comment"/>
+      <rule pattern="([;#]|//).*?\n">
+        <token type="CommentSingle"/>
+      </rule>
+      <rule pattern="/[*][\w\W]*?[*]/">
+        <token type="CommentMultiline"/>
       </rule>
     </state>
   </rules>
-</lexer>
\ No newline at end of file
+</lexer>