diff --git a/ChangeLog b/ChangeLog
index 672a9c0d44..75a8f227be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-29  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/subparse/gstsubparse.c: (feed_textbuf):
+	  Don't access already unref'ed buffer.
+
 2005-11-29  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* gst/playback/gststreamselector.c:
diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c
index 1434d0e876..a01195a917 100644
--- a/gst/subparse/gstsubparse.c
+++ b/gst/subparse/gstsubparse.c
@@ -537,10 +537,10 @@ feed_textbuf (GstSubparse * self, GstBuffer * buf)
 
   self->textbuf = g_string_append_len (self->textbuf,
       (gchar *) GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
-  gst_buffer_unref (buf);
-
   self->offset = GST_BUFFER_OFFSET (buf) + GST_BUFFER_SIZE (buf);
   self->next_offset = self->offset;
+
+  gst_buffer_unref (buf);
 }
 
 static GstFlowReturn