diff --git a/lib/ace/mode/livescript.js b/lib/ace/mode/livescript.js
index fcbb7400..4efd5480 100644
--- a/lib/ace/mode/livescript.js
+++ b/lib/ace/mode/livescript.js
@@ -1,4 +1,4 @@
-define('ace/mode/ls', function(require, exports, module){
+define(function(require, exports, module){
   var identifier, LiveScriptMode, keywordend, stringfill;
   identifier = '(?![\\d\\s])[$\\w\\xAA-\\uFFDC](?:(?!\\s)[$\\w\\xAA-\\uFFDC]|-[A-Za-z])*';
   exports.Mode = LiveScriptMode = (function(superclass){
diff --git a/lib/ace/mode/ruby_highlight_rules.js b/lib/ace/mode/ruby_highlight_rules.js
index 373f1636..2fd64a85 100644
--- a/lib/ace/mode/ruby_highlight_rules.js
+++ b/lib/ace/mode/ruby_highlight_rules.js
@@ -174,11 +174,11 @@ var RubyHighlightRules = function() {
             }, {
                 stateName: "heredoc",
                 token : function(value, currentState, stack) {
-                    var next = value[3] == '-' ? "heredoc" : "indentedHeredoc";
+                    var next = value[2] == '-' ? "indentedHeredoc" : "heredoc";
                     var tokens = value.split(this.splitRegex);
                     stack.push(next, tokens[3]);
                     return [
-                        {type:"constant", value: "<<"},
+                        {type:"constant", value: tokens[1]},
                         {type:"string", value: tokens[2]},
                         {type:"support.class", value: tokens[3]},
                         {type:"string", value: tokens[4]}