diff --git a/ChangeLog b/ChangeLog
index cbc3f59ac3..ca2b06566e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-08  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* ext/mplex/gstmplexibitstream.cc:
+	  Fix event handling (#165525).
+
 2005-02-08  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* ext/mikmod/gstmikmod.c:
diff --git a/ext/mplex/gstmplexibitstream.cc b/ext/mplex/gstmplexibitstream.cc
index d749fe2a4e..28c0ff0b58 100644
--- a/ext/mplex/gstmplexibitstream.cc
+++ b/ext/mplex/gstmplexibitstream.cc
@@ -70,17 +70,15 @@ size_t GstMplexIBitStream::ReadStreamBytes (uint8_t * buf, size_t size)
 {
   guint8 *
       data;
-
   guint
       read;
 
   if (eos)
     return 0;
 
-  if ((read = gst_bytestream_peek_bytes (bs, &data, size)) != size) {
+  while (!eos && (read = gst_bytestream_peek_bytes (bs, &data, size)) != size) {
     GstEvent *
         event;
-
     guint
         pending;