diff --git a/ChangeLog b/ChangeLog
index dc242f633c..84faaa68a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-08  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst-libs/gst/tag/gsttagdemux.c: (gst_tag_demux_pull_start_tag):
+	  Post an error message if we can't pull as many bytes as we need
+	  for the tag. This makes sure the user gets to see a proper error
+	  message if a file with a partial ID3 tag is fed to decodebin, and
+	  not a 'no ID3 tag demuxer' error, which would be confusing
+	  (see #508138).
+
 2008-01-08  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst-libs/gst/pbutils/descriptions.c: (formats):
diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c
index 092f05727f..4cd5411e5d 100644
--- a/gst-libs/gst/tag/gsttagdemux.c
+++ b/gst-libs/gst/tag/gsttagdemux.c
@@ -1035,6 +1035,8 @@ gst_tag_demux_pull_start_tag (GstTagDemux * demux, GstTagList ** tags)
       if (GST_BUFFER_SIZE (buffer) < tagsize) {
         GST_DEBUG_OBJECT (demux, "Only managed to read %u bytes from file",
             GST_BUFFER_SIZE (buffer));
+        GST_ELEMENT_ERROR (demux, STREAM, DECODE,
+            (_("Failed to read tag: not enough data")), (NULL));
         goto done;
       }
     }