diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 825487a0881..736a2407932 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-16  Chong Yidong  <cyd@stupidchicken.com>
+
+	* progmodes/python.el (python-end-of-block): Avoid looping forever
+	if python-next-statement fails.
+
 2007-04-16  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
 
 	* textmodes/bibtex.el (bibtex-entry-field-alist): Use defcustom.