diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 57ea21f4b20..b45b32c770d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-10-11  Chong Yidong  <cyd@stupidchicken.com>
 
+	* emacs-lisp/warnings.el (display-warning): Issue a message if
+	called during daemon initialization.
+
 	* tool-bar.el (tool-bar-local-item)
 	(tool-bar-local-item-from-menu): Put the check for number of
 	display colors into the image expression.