diff --git a/ChangeLog b/ChangeLog
index 817910b011..28a9a312d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-27  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	Patch by: Jan Gerber <j at oil21 dot org>
+
+	* ext/ogg/gstoggdemux.c: (gst_ogg_pad_parse_skeleton_fisbone):
+	Fix calculation of the start time from skeleton streams.
+	Fixes bug #530068.
+
 2008-07-24  Stefan Kost  <ensonic@users.sf.net>
 
 	* tests/examples/seek/seek.c:
diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index 8ad0c55542..4a91ca4bfb 100644
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -598,9 +598,6 @@ gst_ogg_pad_parse_skeleton_fisbone (GstOggPad * pad, ogg_packet * packet)
     data += 3;
 
     fisbone_pad->start_time = ogg->prestime - ogg->basetime;
-    fisbone_pad->start_time += gst_annodex_granule_to_time (start_granule,
-        fisbone_pad->granulerate_n, fisbone_pad->granulerate_d,
-        fisbone_pad->granuleshift);
 
     GST_INFO_OBJECT (pad->ogg, "skeleton fisbone parsed "
         "(serialno: %08x start time: %" GST_TIME_FORMAT
@@ -1410,6 +1407,7 @@ gst_ogg_demux_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&ogg_demux_src_template_factory));
 }
+
 static void
 gst_ogg_demux_class_init (GstOggDemuxClass * klass)
 {