diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 922a9e6ee6e..66b98e8318a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* vc/log-edit.el (log-edit-rewrite-fixes): State its safety pred.
+
 2010-10-28  Glenn Morris  <rgm@gnu.org>
 
 	* term/ns-win.el (global-map, menu-bar-final-items, menu-bar-help-menu):
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index 80d77213abf..c0aa595d968 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -579,6 +579,8 @@ The value should be of the form (REGEXP . REPLACEMENT)
 where REGEXP should match the expression referring to a bug number
 in the text, and REPLACEMENT is an expression to pass to `replace-match'
 to build the Fixes: header.")
+(put 'log-edit-rewrite-fixes 'safe-local-variable
+     (lambda (v) (and (stringp (car-safe v)) (stringp (cdr v)))))
 
 (defun log-edit-insert-changelog (&optional use-first)
   "Insert a log message by looking at the ChangeLog.