diff --git a/ChangeLog b/ChangeLog
index e7f8e8a2e4..073c061522 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-16  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* gst-libs/gst/tag/gsttagdemux.c: (gst_tag_demux_srcpad_event):
+	Forward unknown events upstream to allow latency configuration.
+	Fixes bug #567960.
+
 2009-01-13  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* gst/playback/gstplaybin2.c: (groups_set_locked_state):
diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c
index 8bc1b3c80a..aa16d4f6e3 100644
--- a/gst-libs/gst/tag/gsttagdemux.c
+++ b/gst-libs/gst/tag/gsttagdemux.c
@@ -170,7 +170,7 @@ gst_tag_demux_result_get_type (void)
   if (etype == 0) {
     static const GEnumValue values[] = {
       {GST_TAG_DEMUX_RESULT_BROKEN_TAG, "GST_TAG_DEMUX_RESULT_BROKEN_TAG",
-            "broken-tag"},
+          "broken-tag"},
       {GST_TAG_DEMUX_RESULT_AGAIN, "GST_TAG_DEMUX_RESULT_AGAIN", "again"},
       {GST_TAG_DEMUX_RESULT_OK, "GST_TAG_DEMUX_RESULT_OK", "ok"},
       {0, NULL, NULL}
@@ -838,12 +838,14 @@ gst_tag_demux_srcpad_event (GstPad * pad, GstEvent * event)
       break;
     }
     default:
-      /* FIXME: shouldn't we pass unknown and unhandled events upstream? */
+      res = gst_pad_push_event (tagdemux->priv->sinkpad, event);
+      event = NULL;
       break;
   }
 
   gst_object_unref (tagdemux);
-  gst_event_unref (event);
+  if (event)
+    gst_event_unref (event);
   return res;
 }