diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c47effeaac..0fb84d7de34 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-05  Kim F. Storm  <storm@cua.dk>
+
+	* files.el (magic-mode-regexp-match-limit): New defvar.
+	(set-auto-mode): Use it to limit magic-mode-alist matching.
+
 2006-02-04  Kevin Rodgers  <ihs_4664@yahoo.com>
 
 	* simple.el (display-message-or-buffer): Compare the number of