diff --git a/src/etc/emacs/cm-mode.el b/src/etc/emacs/cm-mode.el
index 469bded047ac0..f1dcfea28fc1e 100644
--- a/src/etc/emacs/cm-mode.el
+++ b/src/etc/emacs/cm-mode.el
@@ -1,8 +1,13 @@
-;; Wrapper for CodeMirror-style emacs modes. Highlighting is done by
-;; running a stateful parser (with first-class state object) over the
-;; buffer, line by line, using the output to add 'face properties, and
-;; storing the parser state at the end of each line. Indentation is
-;; done based on the parser state at the start of the line.
+;;; cm-mode.el --- Wrapper for CodeMirror-style Emacs modes
+
+;; Version: 0.1.0
+;; Url: https://github.com/mozilla/rust
+
+;; Highlighting is done by running a stateful parser (with first-class
+;; state object) over the buffer, line by line, using the output to
+;; add 'face properties, and storing the parser state at the end of
+;; each line. Indentation is done based on the parser state at the
+;; start of the line.
 
 (eval-when-compile (require 'cl))
 
@@ -163,7 +168,7 @@
         (cm-schedule-work 0.05)))))
 
 (defun cm-do-some-work ()
-  (save-excursion 
+  (save-excursion
     (condition-case cnd (cm-do-some-work-inner)
       (error (print cnd) (error cnd)))))
 
@@ -174,6 +179,7 @@
 
 ;; Entry function
 
+;;;###autoload
 (defun cm-mode (mode)
   (set (make-local-variable 'cm-cur-mode) mode)
   (set (make-local-variable 'cm-worklist) (list (copy-marker 1)))
@@ -184,3 +190,5 @@
   (cm-schedule-work 0.05))
 
 (provide 'cm-mode)
+
+;;; cm-mode.el ends here
diff --git a/src/etc/emacs/rust-mode.el b/src/etc/emacs/rust-mode.el
index 94fc9059f483d..7e4af02da2f6a 100644
--- a/src/etc/emacs/rust-mode.el
+++ b/src/etc/emacs/rust-mode.el
@@ -1,3 +1,9 @@
+;;; rust-mode.el --- A major emacs mode for editing Rust source code
+
+;; Version: 0.1.0
+;; Package-Requires: ((cm-mode "0.1.0"))
+;; Url: https://github.com/mozilla/rust
+
 (require 'cm-mode)
 (require 'cc-mode)
 
@@ -277,6 +283,7 @@
             ((eq (rust-context-align cx) t) (+ (rust-context-column cx) (if closing -1 0)))
             (t (+ base (if closing 0 unit)))))))
 
+;;;###autoload
 (define-derived-mode rust-mode fundamental-mode "Rust"
   "Major mode for editing Rust source files."
   (set-syntax-table rust-syntax-table)
@@ -293,3 +300,5 @@
 (define-key rust-mode-map "{" 'rust-electric-brace)
 
 (provide 'rust-mode)
+
+;;; rust-mode.el ends here