diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b8d3798922..a10977b5201 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2007-11-26  Glenn Morris  <rgm@gnu.org>
 
+	* calendar/cal-menu.el (cal-menu-holidays-menu): Use :label rather
+	than :suffix.
+
 	* emacs-lisp/easymenu.el (easy-menu-define): Doc fix.
 
 2007-11-26  Simon Josefsson  <simon@josefsson.org>
diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index 7158774dd2c..60004f7983a 100644
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -94,13 +94,15 @@
     "--"
     ,@(let ((l ()))
         ;; Show 11 years--5 before, 5 after year of middle month.
+        ;; http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01813.html
         (dotimes (i 11)
-          (push (vector "For Year"
+          (push (vector (format "hol-year-%d" i)
                         `(lambda ()
                            (interactive)
                            (holiday-list (+ displayed-year ,(- i 5))
                                          (+ displayed-year ,(- i 5))))
-                        :suffix `(number-to-string (+ displayed-year ,(- i 5))))
+                        :label `(format "For Year %d"
+                                       (+ displayed-year ,(- i 5))))
                 l))
         (nreverse l))
     "--"