diff --git a/Docs/cmake-mode.el b/Docs/cmake-mode.el
index 6feed94..ac4611b 100644
--- a/Docs/cmake-mode.el
+++ b/Docs/cmake-mode.el
@@ -11,6 +11,10 @@
 ;=============================================================================
 ;;; cmake-mode.el --- major-mode for editing CMake sources
 
+;; URL: http://www.cmake.org/CMakeDocs/cmake-mode.el
+;; Version: 20130813
+;; Keywords: languages, tools
+
 ;------------------------------------------------------------------------------
 
 ;;; Commentary:
@@ -18,7 +22,8 @@
 ;; Provides syntax highlighting and indentation for CMakeLists.txt and
 ;; *.cmake source files.
 ;;
-;; Add this code to your .emacs file to use the mode:
+;; If you don't use ELPA, add this code to your .emacs file to use the
+;; mode:
 ;;
 ;;  (setq load-path (cons (expand-file-name "/dir/with/cmake-mode") load-path))
 ;;  (require 'cmake-mode)
@@ -26,6 +31,8 @@
 ;;        (append '(("CMakeLists\\.txt\\'" . cmake-mode)
 ;;                  ("\\.cmake\\'" . cmake-mode))
 ;;                auto-mode-alist))
+;;
+;; If you use ELPA, this is set up automatically through autoloads.
 
 ;------------------------------------------------------------------------------
 
@@ -246,6 +253,8 @@ the indentation.  Otherwise it retains the same position on the line"
 ;;
 ;; CMake mode startup function.
 ;;
+
+;;;###autoload
 (defun cmake-mode ()
   "Major mode for editing CMake listfiles.
 
@@ -354,4 +363,10 @@ optional argument topic will be appended to the argument list."
 ; This file provides cmake-mode.
 (provide 'cmake-mode)
 
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode))
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode))
+
 ;;; cmake-mode.el ends here