diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d43bbe29bf..aec62a08105 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2007-09-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* vc-cvs.el (vc-cvs-annotate-time): Use inhibit-read-only and
+	inhibit-modification-hooks.
+
 	* calendar/cal-bahai.el (mark-bahai-diary-entries): Fix up typo.
 	(calendar-bahai-print-date, calendar-bahai-goto-date)
 	(diary-bahai-list-entries, diary-bahai-insert-entry):
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index f90f698275e..0a17388ae34 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -590,7 +590,8 @@ encoded as fractional days."
 systime, or nil if there is none."
   (let* ((bol (point))
          (cache (get-text-property bol 'vc-cvs-annotate-time))
-         buffer-read-only)
+         (inhibit-read-only t)
+         (inhibit-modification-hooks t))
     (cond
      (cache)
      ((looking-at