diff --git a/etc/TODO b/etc/TODO
index 9b7a0b0a1b0..34dec4f1de2 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -437,11 +437,16 @@ but which can also be used as a modifier).
    e.g auto-mode-alist, the right face. [nickrob@snap.net.nz has a patch
    for this for inclusion after 22.1].
 
+** Possibly make `list-holidays' eval items in the calendar-holidays variable.
+   See thread
+   <http://lists.gnu.org/archive/html/emacs-devel/2006-02/msg01034.html>.
+   [rgm@gnu.org will look at this after 22.1]
+
 * Internal changes
 
 ** Replace gmalloc.c with the modified Doug Lea code from the current
   GNU libc so that the special mmapping of buffers can be removed --
-  that apparently loses under Solaris, at least.  [fx has mostly done
+  that apparently loses under Solaris, at least. [fx has mostly done
   this.]
 
 ** Rewrite make-docfile to be clean and maintainable.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31df6e9f72c..8ce3d8af6c5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-10  Glenn Morris  <rgm@gnu.org>
+
+	* calendar/calendar.el (calendar-holidays): Doc fix.
+	* calendar/holidays.el (list-holidays): Doc fix.
+
 2006-03-10  Nick Roberts  <nickrob@snap.net.nz>
 
 	* progmodes/gdb-ui.el (gdba): Don't call gdb-init-1 explicitly as