diff --git a/ChangeLog b/ChangeLog
index f5da9f13bf..70bdda66c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-28  Wim Taymans  <wim@fluendo.com>
+
+	* ext/ogg/gstoggdemux.c: (gst_ogg_pad_submit_packet):
+	If we're building a chain we are not in an error case
+	when we queue a buffer.
+
 2005-06-28  Andy Wingo  <wingo@pobox.com>
 
 	* *.c: Don't cast to GstObject before reffing/unreffing.
diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index d03948902f..6e2fe13572 100644
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -661,6 +661,8 @@ gst_ogg_pad_submit_packet (GstOggPad * pad, ogg_packet * packet)
         GST_BUFFER_OFFSET (buf) = -1;
         GST_BUFFER_OFFSET_END (buf) = packet->granulepos;
         pad->headers = g_list_append (pad->headers, buf);
+        /* we are ok now */
+        ret = GST_FLOW_OK;
       }
     }
   } else {