diff --git a/ChangeLog b/ChangeLog
index 8fe6d96c76..a443675cc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-26  Wim Taymans  <wim.taymans@gmail.com>
+
+	* gst/gstbus.c: (poll_func):
+	Improve debugging when dealing with _poll().
+
 2007-09-26  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/gstregistryxml.c:
diff --git a/gst/gstbus.c b/gst/gstbus.c
index facfee8e1c..545baaa0e2 100644
--- a/gst/gstbus.c
+++ b/gst/gstbus.c
@@ -834,17 +834,23 @@ typedef struct
 static void
 poll_func (GstBus * bus, GstMessage * message, GstBusPollData * poll_data)
 {
+  GstMessageType type;
+
   if (!g_main_loop_is_running (poll_data->loop)) {
     GST_DEBUG ("mainloop %p not running", poll_data->loop);
     return;
   }
 
-  if (GST_MESSAGE_TYPE (message) & poll_data->events) {
+  type = GST_MESSAGE_TYPE (message);
+
+  if (type & poll_data->events) {
     g_return_if_fail (poll_data->message == NULL);
     /* keep ref to message */
     poll_data->message = gst_message_ref (message);
     GST_DEBUG ("mainloop %p quit", poll_data->loop);
     g_main_loop_quit (poll_data->loop);
+  } else {
+    GST_DEBUG ("type %08x does not match %08x", type, poll_data->events);
   }
 }