diff --git a/ext/lame/gstlame.c b/ext/lame/gstlame.c
index d91f27fde5..ce85ad2709 100644
--- a/ext/lame/gstlame.c
+++ b/ext/lame/gstlame.c
@@ -65,7 +65,7 @@ GST_PAD_TEMPLATE_FACTORY (gst_lame_src_factory,
   GST_PAD_ALWAYS,
   GST_CAPS_NEW (
     "gstlame_src",
-    "audio/mp3",
+    "audio/x-mp3",
     NULL
   )
 )
diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c
index 05db5b514e..65864f65ed 100644
--- a/ext/mad/gstmad.c
+++ b/ext/mad/gstmad.c
@@ -130,7 +130,7 @@ GST_PAD_TEMPLATE_FACTORY (mad_sink_template_factory,
   GST_PAD_ALWAYS,
   GST_CAPS_NEW (
     "mad_sink",
-    "audio/mp3",
+    "audio/x-mp3",
     NULL
   )
 )
diff --git a/gst-libs/gst/media-info/media-info.c b/gst-libs/gst/media-info/media-info.c
index 08f93eb601..4dea33b45d 100644
--- a/gst-libs/gst/media-info/media-info.c
+++ b/gst-libs/gst/media-info/media-info.c
@@ -409,7 +409,7 @@ gst_media_info_get_decoder (GstMediaInfo *info, const char *mime)
     GMI_DEBUG("DEBUG: no decoder in table, inserting one\n");
     if (strcmp (mime, "application/x-ogg") == 0)
       factory = g_strdup ("vorbisfile");
-    else if (strcmp (mime, "audio/mp3") == 0)
+    else if (strcmp (mime, "audio/x-mp3") == 0)
       factory = g_strdup ("mad");
     else if (strcmp (mime, "audio/x-wav") == 0)
       factory = g_strdup ("wavparse");
diff --git a/gst/mpegaudioparse/gstmp3types.c b/gst/mpegaudioparse/gstmp3types.c
index d0ee00c9c4..43c82b693c 100644
--- a/gst/mpegaudioparse/gstmp3types.c
+++ b/gst/mpegaudioparse/gstmp3types.c
@@ -24,7 +24,7 @@
 static GstCaps* mp3_type_find(GstBuffer *buf, gpointer private);
 
 static GstTypeDefinition mp3type_definitions[] = {
-  { "mp3types_audio/mp3", "audio/mp3", ".mp3 .mp2 .mp1 .mpga", mp3_type_find },
+  { "mp3types_audio/x-mp3", "audio/x-mp3", ".mp3 .mp2 .mp1 .mpga", mp3_type_find },
   { NULL, NULL, NULL, NULL },
 };
 
@@ -92,7 +92,7 @@ mp3_type_find(GstBuffer *buf, gpointer private)
     return NULL;
 
 done:
-  caps = gst_caps_new ("mp3_type_find", "audio/mp3", NULL);
+  caps = gst_caps_new ("mp3_type_find", "audio/x-mp3", NULL);
 
   return caps;
 }
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index fa466f680a..f78415f17a 100644
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -42,7 +42,7 @@ mp3_src_factory (void)
   	GST_PAD_ALWAYS,
   	gst_caps_new (
   	  "mp3parse_src",
-    	  "audio/mp3",
+    	  "audio/x-mp3",
 	  /*
 	  gst_props_new (
     	    "layer",   GST_PROPS_INT_RANGE (1, 3),
@@ -63,7 +63,7 @@ mp3_sink_factory (void)
   	GST_PAD_ALWAYS,
   	gst_caps_new (
   	  "mp3parse_sink",
-    	  "audio/mp3",
+    	  "audio/x-mp3",
 	  NULL),
 	NULL);
 };
diff --git a/gst/mpegstream/gstmpegdemux.c b/gst/mpegstream/gstmpegdemux.c
index b480222338..8e0f7d5970 100644
--- a/gst/mpegstream/gstmpegdemux.c
+++ b/gst/mpegstream/gstmpegdemux.c
@@ -64,7 +64,7 @@ GST_PAD_TEMPLATE_FACTORY (audio_factory,
   GST_PAD_SOMETIMES,
   GST_CAPS_NEW (
     "mpeg_demux_audio",
-    "audio/mp3",
+    "audio/x-mp3",
     NULL
   )
 );