diff --git a/.dir-locals.el b/.dir-locals.el
index 12b85561ee8..f12dbf7d859 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,4 +1,5 @@
 ((nil . ((tab-width . 8)
+         (sentence-end-double-space . t)
          (fill-column . 70)))
  (c-mode . ((c-file-style . "GNU")))
  (change-log-mode . ((add-log-time-zone-rule . t)
@@ -6,5 +7,3 @@
 		     (bug-reference-url-format . "http://debbugs.gnu.org/%s")
 		     (mode . bug-reference)))
  (diff-mode . ((mode . whitespace))))
-
-;; arch-tag: fb93c160-e9fe-4184-aad1-e4f5daa11cbd
diff --git a/ChangeLog b/ChangeLog
index fc541930c4d..9f785c9e396 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-05  Glenn Morris  <rgm@gnu.org>
+
+	* .dir-locals.el: The Emacs convention is sentence-end-double-space.
+
 2010-10-03  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* configure.in (NO_INLINE, noinline): Move here from src/xterm.c.