diff --git a/lib/ace/mode/ruby.js b/lib/ace/mode/ruby.js
index 9214228d..ed68bb4c 100644
--- a/lib/ace/mode/ruby.js
+++ b/lib/ace/mode/ruby.js
@@ -79,7 +79,7 @@ oop.inherits(Mode, TextMode);
             return -2;
         }
         else {
-            return doc.indentRows(startRow, endRow, "//");
+            return doc.indentRows(startRow, endRow, "#");
         }
     };
 
diff --git a/lib/ace/mode/ruby_highlight_rules.js b/lib/ace/mode/ruby_highlight_rules.js
index 9cf7a12a..dc4de4a6 100644
--- a/lib/ace/mode/ruby_highlight_rules.js
+++ b/lib/ace/mode/ruby_highlight_rules.js
@@ -74,6 +74,10 @@ RubyHighlightRules = function() {
 	            token : "comment",
 	            regex : "#.*$"
 	        }, {
+                token : "comment", // multi line comment
+                regex : "^\=begin$",
+                next : "comment"
+            }, {
 	            token : "string.regexp",
 	            regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
 	        }, {
@@ -135,6 +139,10 @@ RubyHighlightRules = function() {
         ],
         "comment" : [
 	        {
+                token : "comment", // closing comment
+                regex : "^\=end$",
+                next : "start"
+            }, {
 	            token : "comment", // comment spanning whole line
 	            regex : ".+"
 	        }