diff --git a/ChangeLog b/ChangeLog
index f49fed4bb5..0faf96dd48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-07  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* ext/flac/gstflacenc.c: (gst_flac_enc_seek_callback):
+	If seeking failed return the appropiate return value to FLAC.
+	Otherwise it thinks seeking was successfull and tries to rewrite
+	parts of the headers which then get appended to the output.
+
 2008-08-07  Tim-Philipp Müller  <tim.muller at collabora co uk>
 
 	Patch by: Frederic Crozat <fcrozat@mandriva.org>
diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c
index 1e29343cf6..4f290c4ad5 100644
--- a/ext/flac/gstflacenc.c
+++ b/ext/flac/gstflacenc.c
@@ -797,6 +797,12 @@ gst_flac_enc_seek_callback (const FLAC__StreamEncoder * encoder,
     } else {
       GST_DEBUG ("Seek to %" G_GUINT64_FORMAT " %s", absolute_byte_offset,
           "failed");
+#ifdef LEGACY_FLAC
+      return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED;
+#else
+      return FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED;
+#endif
+
     }
   } else {
     GST_DEBUG ("Seek to %" G_GUINT64_FORMAT " failed (no peer pad)",