diff --git a/src/ChangeLog b/src/ChangeLog
index 91694368fe0..db45905d4f2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-27  Kim F. Storm  <storm@cua.dk>
+
+	* xdisp.c (handle_composition_prop): Set stop_charpos before push_it.
+
 2006-06-25  Kim F. Storm  <storm@cua.dk>
 
 	* s/gnu-linux.h (SIGNALS_VIA_CHARACTERS): Define for Linux kernel