diff --git a/lib/ace/mode/velocity_highlight_rules.js b/lib/ace/mode/velocity_highlight_rules.js
index 2227f769..c675ba7c 100644
--- a/lib/ace/mode/velocity_highlight_rules.js
+++ b/lib/ace/mode/velocity_highlight_rules.js
@@ -130,16 +130,11 @@ var VelocityHighlightRules = function() {
         ],
         "comment" : [
             {
-                token : "comment.block", // closing comment
-                regex : ".*?\\*#",
+                token : "comment", // closing comment
+                regex : "\\*#|-->",
                 next : "start"
             }, {
-                token : "comment", // closing HTML comment
-                regex : ".*?-->",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                regex : ".+"
+                defaultToken: "comment"
             }
         ],
         "vm_start" : [
@@ -233,4 +228,4 @@ var VelocityHighlightRules = function() {
 oop.inherits(VelocityHighlightRules, TextHighlightRules);
 
 exports.VelocityHighlightRules = VelocityHighlightRules;
-});
+});
\ No newline at end of file