diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c39de6bd44e..399a12cab97 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-21  Chong Yidong  <cyd@stupidchicken.com>
+
+	* image.el (image-type-from-file-name, image-type): Simplify.
+	(image-type-auto-detected-p): Don't scan auto-mode-alist.
+
+	* files.el (magic-mode-alist): Remove image-type-auto-detected-p.
+	(magic-fallback-mode-alist): Add image-type-auto-detected-p.
+
 2007-05-20  Nick Roberts  <nickrob@snap.net.nz>
 
 	* t-mouse.el (t-mouse-mode): Reset t-mouse-mode to nil if there