diff --git a/lib/ace/mode/ruby_highlight_rules.js b/lib/ace/mode/ruby_highlight_rules.js
index b36e9c84..b28376fa 100644
--- a/lib/ace/mode/ruby_highlight_rules.js
+++ b/lib/ace/mode/ruby_highlight_rules.js
@@ -45,8 +45,8 @@ var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightR
 var RubyHighlightRules = function() {
 
     var builtinFunctions = lang.arrayToMap(
-        ("abort|Array|at_exit|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|eval|exec|exit|exit!" +
-        "fail|Float|fork|format|gets|global_variables|gsub|gsub!|Integer|lambda|load|local_variables|loop|open|p|print|" +
+        ("abort|Array|at_exit|attr|attr_writer|attr_reader|attr_accessor|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|defined?|eval|exec|exit|exit!" +
+        "fail|Float|fork|format|gem|gets|global_variables|gsub|gsub!|include|Integer|lambda|load|local_variables|loop|open|p|print|" +
         "printf|proc|putc|puts|raise|rand|readline|readlines|require|scan|select|set_trace_func|sleep|split|sprintf|srand|" +
         "String|syscall|system|sub|sub!|test|throw|trace_var|trap|untrace_var|" +
         "atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan").split("|")
@@ -54,7 +54,7 @@ var RubyHighlightRules = function() {
 
     var keywords = lang.arrayToMap(
         ("alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|__FILE__|finally|for|" +
-        "if|in|__LINE__|module|next|not|or|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield").split("|")
+        "if|in|__LINE__|module|next|not|or|private|protected|public|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield").split("|")
     );
 
     var buildinConstants = lang.arrayToMap(