diff --git a/ChangeLog b/ChangeLog
index eb67a68881..1725bc9389 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Sep  3 18:26:00 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/inf-ruby.el (inf-ruby-keys, run-ruby): Add magic autoload comments.
+
+	* misc/rdoc-mode.el (rdoc-mode): Ditto.
+
+	* misc/ruby-electric.el (ruby-electric-mode): Ditto.
+
+	* misc/ruby-style.el (ruby-style-c-mode): Ditto.
+
 Tue Sep  3 17:06:15 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/ruby/test_rubyoptions.rb
diff --git a/misc/inf-ruby.el b/misc/inf-ruby.el
index ea03eee23d..b3f4f10267 100644
--- a/misc/inf-ruby.el
+++ b/misc/inf-ruby.el
@@ -156,6 +156,7 @@
        (define-key inferior-ruby-mode-map "\C-c\C-l" 'ruby-load-file)
 ))
 
+;;;###autoload
 (defun inf-ruby-keys ()
   "Set local key defs for inf-ruby in ruby-mode"
   (define-key ruby-mode-map "\M-\C-x" 'ruby-send-definition)
@@ -265,6 +266,7 @@ Defaults to a regexp ignoring all inputs of 0, 1, or 2 letters.")
                  (ruby-args-to-list (substring string pos
                                                  (length string)))))))))
 
+;;;###autoload
 (defun run-ruby (cmd)
   "Run an inferior Ruby process, input and output via buffer *ruby*.
 If there is a process already running in `*ruby*', switch to that buffer.
diff --git a/misc/rdoc-mode.el b/misc/rdoc-mode.el
index ec715798ae..1bfd34bf2d 100644
--- a/misc/rdoc-mode.el
+++ b/misc/rdoc-mode.el
@@ -8,6 +8,8 @@
 ;; License: Ruby's
 
 (require 'derived)
+
+;;;###autoload
 (define-derived-mode rdoc-mode text-mode "RDoc"
   "Major mode for RD editing.
 \\{rdoc-mode-map}"
diff --git a/misc/ruby-electric.el b/misc/ruby-electric.el
index 57a293d21f..632bc4fb76 100644
--- a/misc/ruby-electric.el
+++ b/misc/ruby-electric.el
@@ -93,6 +93,7 @@ inserted. The word 'all' will do all insertions."
 closing bracket or not."
   :type 'boolean :group 'ruby-electric)
 
+;;;###autoload
 (define-minor-mode ruby-electric-mode
   "Toggle Ruby Electric minor mode.
 With no argument, this command toggles the mode.  Non-null prefix
diff --git a/misc/ruby-style.el b/misc/ruby-style.el
index 3ce55cd1ab..f81861afea 100644
--- a/misc/ruby-style.el
+++ b/misc/ruby-style.el
@@ -64,6 +64,7 @@
     (access-label /)
     )))
 
+;;;###autoload
 (defun ruby-style-c-mode ()
   (interactive)
   (if (or (let ((name (buffer-file-name))) (and name (string-match "/ruby\\>" name)))