diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c817a59a03a..5102204b571 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-23  Glenn Morris  <rgm@gnu.org>
+
+	* files.el (safe-local-eval-forms): Add the write-file-hooks version.
+
 2011-02-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* help-fns.el (describe-function-1): Don't signal an error just because
diff --git a/lisp/files.el b/lisp/files.el
index 014469ed8fc..3409ebe02e1 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2806,7 +2806,9 @@ symbol and VAL is a value that is considered safe."
   :type 'alist)
 
 (defcustom safe-local-eval-forms
-  '((add-hook 'write-file-functions 'time-stamp)
+  ;; This should be here at least as long as Emacs supports write-file-hooks.
+  '((add-hook 'write-file-hooks 'time-stamp)
+    (add-hook 'write-file-functions 'time-stamp)
     (add-hook 'before-save-hook 'time-stamp))
   "Expressions that are considered safe in an `eval:' local variable.
 Add expressions to this list if you want Emacs to evaluate them, when
@@ -2814,7 +2816,7 @@ they appear in an `eval' local variable specification, without first
 asking you for confirmation."
   :risky t
   :group 'find-file
-  :version "22.2"
+  :version "24.1"			; added write-file-hooks
   :type '(repeat sexp))
 
 ;; Risky local variables: