diff --git a/lib/ace/mode/ruby_highlight_rules.js b/lib/ace/mode/ruby_highlight_rules.js
index d117d2a6..1bb946d2 100644
--- a/lib/ace/mode/ruby_highlight_rules.js
+++ b/lib/ace/mode/ruby_highlight_rules.js
@@ -103,7 +103,10 @@ var RubyHighlightRules = function() {
                 regex : "[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"
 	        }, {
                 token : "variable.instancce", // instance variable
-                regex : "@{1,2}(?:[a-zA-Z]|\d)+"
+                regex : "@{1,2}(?:[a-zA-Z_]|\d)+"
+	        }, {
+                token : "variable.class", // class name
+                regex : "[A-Z](?:[a-zA-Z_]|\d)+"
 	        }, {
                 token : "string", // symbol
                 regex : "[:](?:[a-zA-Z]|\d)+"