diff --git a/.etckeeper b/.etckeeper
index caf16b53..c37c4b29 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -415,6 +415,9 @@ maybe chmod 0644 'dpkg/shlibs.default'
 maybe chmod 0644 'dpkg/shlibs.override'
 maybe chmod 0644 'drirc'
 maybe chmod 0755 'elinks'
+maybe chmod 0755 'emacs'
+maybe chmod 0755 'emacs/site-start.d'
+maybe chmod 0644 'emacs/site-start.d/50cmake-data.el'
 maybe chmod 0644 'email-addresses'
 maybe chmod 0644 'environment'
 maybe chmod 0755 'etckeeper'
diff --git a/emacs/site-start.d/50cmake-data.el b/emacs/site-start.d/50cmake-data.el
new file mode 100644
index 00000000..96fa7bab
--- /dev/null
+++ b/emacs/site-start.d/50cmake-data.el
@@ -0,0 +1,15 @@
+;; -*-emacs-lisp-*-
+;;
+;; Emacs startup file for the Debian GNU/Linux cmake package
+
+(if (file-exists-p "/usr/share/emacs/site-lisp/cmake-mode.el")
+ (progn
+  (debian-pkg-add-load-path-item (concat "/usr/share/"
+                                  (symbol-name debian-emacs-flavor)
+                                  "/site-lisp/cmake-data"))
+  (autoload 'cmake-mode "cmake-mode")
+  (setq auto-mode-alist
+   (append '(("CMakeLists\\.txt\\'" . cmake-mode)
+             ("\\.cmake\\'" . cmake-mode))
+    auto-mode-alist)))
+ (message "cmake-data removed but not purged, skipping setup"))