2 files changed, 7 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10cfc97e41f..e820dd5ce7f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-08  Julien Danjou  <julien@danjou.info>
+
+        * progmodes/ruby-mode.el (auto-mode-alist): Add Rakefile in
+        `auto-mode-alist' (Bug#12835).
+
 2012-11-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/perl-mode.el (perl-prettify-symbols): New defcustom.
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 84cf7308d75..c9bfcefb748 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1638,6 +1638,8 @@ The variable `ruby-indent-level' controls the amount of indentation.
 
 ;;;###autoload
 (add-to-list 'auto-mode-alist (cons (purecopy "\\.rb\\'") 'ruby-mode))
+;;;###autoload
+(add-to-list 'auto-mode-alist '("Rakefile\\'" . ruby-mode))
 
 ;;;###autoload
 (dolist (name (list "ruby" "rbx" "jruby" "ruby1.9" "ruby1.8"))