diff --git a/lib/ace/mode/coldfusion_highlight_rules.js b/lib/ace/mode/coldfusion_highlight_rules.js
index 536431c2..dddf867d 100644
--- a/lib/ace/mode/coldfusion_highlight_rules.js
+++ b/lib/ace/mode/coldfusion_highlight_rules.js
@@ -58,6 +58,10 @@ var ColdfusionHighlightRules = function() {
             token : "meta.tag",
             regex : "<(?=script)",
             next : "script"
+        }, {
+            token : "meta.tag",
+            regex : "<(?=cfscript)",
+            next : "cfscript"
         }, {
             token : "meta.tag",
             regex : "<(?=style)",
@@ -86,7 +90,8 @@ var ColdfusionHighlightRules = function() {
     xml_util.tag(this.$rules, "tag", "start");
     xml_util.tag(this.$rules, "style", "css-start");
     xml_util.tag(this.$rules, "script", "js-start");
-    
+    xml_util.tag(this.$rules, "cfscript", "js-start");
+
     this.embedRules(JavaScriptHighlightRules, "js-", [{
         token: "comment",
         regex: "\\/\\/.*(?=<\\/script>)",
@@ -95,6 +100,14 @@ var ColdfusionHighlightRules = function() {
         token: "meta.tag",
         regex: "<\\/(?=script)",
         next: "tag"
+    }, {
+        token: "comment",
+        regex: "\\/\\/.*(?=<\\/cfscript>)",
+        next: "tag"
+    }, {
+        token: "meta.tag",
+        regex: "<\\/(?=cfscript)",
+        next: "tag"
     }]);
     
     this.embedRules(CssHighlightRules, "css-", [{