diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index b7911e9c531..0089ebc1169 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-21  Tom Tromey  <tromey@redhat.com>
+
+	* custom.texi (Directory Variables): Grammar fix.  Link to Safe File
+	Variables node.
+
 2008-05-19  Tom Tromey  <tromey@redhat.com>
 
 	* custom.texi (Variables): Add Directory Variables to menu.
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index a85925c0f05..d03a0a1657f 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -1268,7 +1268,7 @@ variable.
 @cindex local variables in directories
 @cindex directory local variables
 
-  Emacs provides a way to specify local variable values per-directory.
+  Emacs provides a mechanism to specify local variable values per-directory.
 This can be done one of two ways.
 
   The first approach is to put a special file, named
@@ -1320,7 +1320,7 @@ way:
 @end example
 
   Unsafe directory-local variables are handled in the same way as
-unsafe file-local variables.
+unsafe file-local variables (@pxref{Safe File Variables}).
 
 @node Key Bindings
 @section Customizing Key Bindings