diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b4cbf0e11c..71db241df6f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-19  Glenn Morris  <rgm@gnu.org>
+
+	* autoinsert.el (auto-insert-alist): Update template to FDL 1.3+.
+
+	* emacs-lisp/cl.el (floor*, ceiling*, truncate*, round*, mod*):
+	* term/w32-win.el (x-select-font): Declare.
+
+	* emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): Fix a/an typo.
+	Use the imperative for all help strings.
+
 2008-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* textmodes/ispell.el (ispell-dictionary-base-alist): Adjust to the
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index d757d60b3da..18eaf8b94dc 100644
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -541,6 +541,14 @@ The elements of LIST are not copied, just the list structure itself."
   list)
 
 (defalias 'cl-member 'memq)   ; for compatibility with old CL package
+
+;; Autoloaded, but we have not loaded cl-loaddefs yet.
+(declare-function floor* "cl-extra" (x &optional y))
+(declare-function ceiling* "cl-extra" (x &optional y))
+(declare-function truncate* "cl-extra" (x &optional y))
+(declare-function round* "cl-extra" (x &optional y))
+(declare-function mod* "cl-extra" (x y))
+
 (defalias 'cl-floor 'floor*)
 (defalias 'cl-ceiling 'ceiling*)
 (defalias 'cl-truncate 'truncate*)