diff --git a/src/ChangeLog b/src/ChangeLog
index 4c3c6a80d49..3752b58c831 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-30  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* xterm.c (handle_one_xevent): bzero compose_status when nbytes
+	is not zero.
+
 2005-07-01  Masatake YAMATO  <jet@gyve.org>
 
 	* emacs.c (main): Passing ADD_NO_RANDOMIZE to
diff --git a/src/xterm.c b/src/xterm.c
index cc76bae7dbf..ab299d1fa36 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6287,6 +6287,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
           if (compose_status.chars_matched > 0 && nbytes == 0)
             break;
 
+          bzero (&compose_status, sizeof (compose_status));
           orig_keysym = keysym;
 
 	  /* Common for all keysym input events.  */