diff --git a/ChangeLog b/ChangeLog
index cb528da405..ff827785e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-18  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_formatid_to_caps):
+	  Add ID3 mime. Should partially fix #155274 (although raw mp3
+	  sounds awful, it doesn't parse correctly in the decoder-only
+	  case).
+
 2004-12-17  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* ext/ffmpeg/gstffmpegcodecmap.c:
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index d921270f58..1c53524a29 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -1290,6 +1290,8 @@ gst_ffmpeg_formatid_to_caps (const gchar * format_name)
     caps = gst_caps_new_simple ("video/x-4xm", NULL);
   } else if (!strcmp (format_name, "matroska")) {
     caps = gst_caps_new_simple ("video/x-matroska", NULL);
+  } else if (!strcmp (format_name, "mp3")) {
+    caps = gst_caps_new_simple ("application/x-id3", NULL);
   } else {
     gchar *name;