diff --git a/src/ChangeLog b/src/ChangeLog
index 55d4ce23f82..abea2c4a2dc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-20  Chong Yidong  <cyd@stupidchicken.com>
+
+	* xdisp.c (get_next_display_element): Handle string display
+	correctly when checking for the end of a box run.
+
 2008-09-20  Glenn Morris  <rgm@gnu.org>
 
 	* fileio.c (Frename_file): Avoid copying to trash if a rename involves