diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 164f8e27023e9b74a1b2616b494d6a81ae1be5c5..f313e83b14a09e5044acfbe2184f8bfda97256f3 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-25  Glenn Morris  <rgm@gnu.org>
+
+	* customize.texi (Variable Definitions): Add :risky and :safe keywords.
+
 2007-10-22  Juri Linkov  <juri@jurta.org>
 
 	* minibuf.texi (Text from Minibuffer, Minibuffer Completion)
diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi
index c375706e6f9b2fa87fd09e88749fa558fc5c4aa9..7c723a29f28898d2742af59572e8798ceb95133f 100644
--- a/doc/lispref/customize.texi
+++ b/doc/lispref/customize.texi
@@ -393,6 +393,14 @@ value and then reevaluates the defcustom.  By that time, the necessary
 variables and functions will be defined, so there will not be an error.
 @end table
 
+@item :risky @var{value}
+@kindex risky@r{, @code{defcustom} keyword}
+Set this variable's @code{risky-local-variable} property to @var{value}.
+
+@item :safe @var{function}
+@kindex safe@r{, @code{defcustom} keyword}
+Set this variable's @code{safe-local-variable} property to @var{function}.
+
 @item :set-after @var{variables}
 @kindex set-after@r{, @code{defcustom} keyword}
 When setting variables according to saved customizations, make sure to