diff --git a/ChangeLog b/ChangeLog
index a438623b26..bd7511e59d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-15  Wim Taymans  <wim@fluendo.com>
+
+	* ext/ogg/gstoggdemux.c: (gst_ogg_pad_submit_packet):
+	Fix seeking performance in the case where a non-header 
+	packet has a 0 granulepos (busted theora case). 
+	Fixes #341719
+
 2006-05-15  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/subparse/gstsubparse.c:
diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index 69c354eb2b..d94d477ffe 100644
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -1041,9 +1041,16 @@ gst_ogg_pad_submit_packet (GstOggPad * pad, ogg_packet * packet)
 
   granule = packet->granulepos;
   if (granule != -1) {
+    GST_DEBUG_OBJECT (ogg, "%p has granulepos %lld", pad, granule);
     ogg->current_granule = granule;
     pad->current_granule = granule;
+    /* granulepos 0 and -1 are considered header packets.
+     * Note that since theora is busted, it can create non-header
+     * packets with 0 granulepos. We will correct for this when our
+     * internal decoder produced a frame and we don't have a
+     * granulepos because in that case the granulpos must have been 0 */
     if (pad->first_granule == -1 && granule != 0) {
+      GST_DEBUG_OBJECT (ogg, "%p found first granulepos %lld", pad, granule);
       pad->first_granule = granule;
     }
   }
@@ -1059,6 +1066,15 @@ gst_ogg_pad_submit_packet (GstOggPad * pad, ogg_packet * packet)
   if (pad->start_time != GST_CLOCK_TIME_NONE) {
     GstOggChain *chain = pad->chain;
 
+    /* correction for busted ogg, if the internal decoder outputed
+     * a timestamp but we did not get a granulepos, it must have
+     * been 0 and the time is therefore also 0 */
+    if (pad->first_time == -1) {
+      GST_DEBUG_OBJECT (ogg, "%p found start time without granulepos", pad);
+      pad->first_granule = 0;
+      pad->first_time = 0;
+    }
+
     /* check if complete chain has start time */
     if (chain == ogg->building_chain) {