diff --git a/ChangeLog b/ChangeLog
index 51e0e91466..eaeb7ebeb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* gst/law/alaw.c : alawdec should be registered with type ALAWDEC, not ALAWENC
 	* gst/law/alaw-decode.c : put audio/x-alaw on pads, instead of audio/x-mulaw
 	* gst/law/alaw-encode.c : (idem)
+	* ext/a52dec/gsta52dec.c : mark audio/a52, audio/ac3 as deprecated in a comment
+	* gst/ac3parse/gstac3parse.c : audio/ac3 => audio/x-ac3
+	* gst/realmedia/rmdemux.c : audio/a52 => audio/x-ac3
 
 2004-05-09  Benjamin Otte  <otte@gnome.org>
 
diff --git a/ext/a52dec/gsta52dec.c b/ext/a52dec/gsta52dec.c
index 3cedabfaa0..01aa07b9fb 100644
--- a/ext/a52dec/gsta52dec.c
+++ b/ext/a52dec/gsta52dec.c
@@ -56,8 +56,8 @@ enum
 };
 
 /*
- * "audio/a52" and "audio/ac3" are the same format.  The name
- * "ac3" is now deprecated and should not be used in new code.
+ * "audio/a52", "audio/x-a52" and "audio/ac3" should not be used (deprecated names)
+ * Only use "audio/x-ac3" in new code.
  */
 static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
diff --git a/gst/ac3parse/gstac3parse.c b/gst/ac3parse/gstac3parse.c
index ce91325b8c..eac8dc1b07 100644
--- a/gst/ac3parse/gstac3parse.c
+++ b/gst/ac3parse/gstac3parse.c
@@ -99,7 +99,7 @@ static GstStaticPadTemplate gst_ac3parse_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("audio/ac3, "
+    GST_STATIC_CAPS ("audio/x-ac3, "
         "channels = (int) [ 1, 6 ], " "rate = (int) [ 32000, 48000 ]")
     );
 
diff --git a/gst/realmedia/rmdemux.c b/gst/realmedia/rmdemux.c
index 6904694b75..27a9394cab 100644
--- a/gst/realmedia/rmdemux.c
+++ b/gst/realmedia/rmdemux.c
@@ -520,7 +520,7 @@ gst_rmdemux_add_stream (GstRMDemux * rmdemux, GstRMDemuxStream * stream)
         gst_pad_new_from_template (gst_static_pad_template_get
         (&gst_rmdemux_audiosrc_template), g_strdup_printf ("audio_%02d",
             rmdemux->n_audio_streams));
-    stream->caps = gst_caps_new_simple ("audio/a52", NULL);
+    stream->caps = gst_caps_new_simple ("audio/x-ac3", NULL);
     gst_caps_set_simple (stream->caps,
         "rate", G_TYPE_INT, (int) stream->rate,
         "channels", G_TYPE_INT, stream->n_channels, NULL);