diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 85a8bedf944..7173b620105 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -108,6 +108,13 @@
 
 	* simple.el: Comment out change of 2001-09-13.
 
+2001-09-13  Milan Zamazal  <pdm@zamazal.org>
+
+	* progmodes/compile.el (grep-compute-defaults): Don't set
+	grep-command/grep-find-command when it is already non-nil.
+	(grep-command): Make it a user option.
+	(grep-find-command): Likewise.
+
 2001-09-13  Michael Kifer  <kifer@cs.sunysb.edu>
 
 	* viper-cmd.el (viper-replace-char-subr, viper-envelop-ESC-key):