diff --git a/ChangeLog b/ChangeLog
index fd56fa7922..967998c770 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-14  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* ext/lame/gstlame.c:
+	* ext/mad/gstmad.c:
+	  sync caps.  Make sure mad can only output a list of rates, not
+	  a full range.  In the future, have three caps lists for each of the
+	  mpeg versions.  Change mpegversion to a double as well.
+
 2004-06-14  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/volume/.cvsignore:
diff --git a/ext/lame/gstlame.c b/ext/lame/gstlame.c
index de9b11ddae..3c84b449b4 100644
--- a/ext/lame/gstlame.c
+++ b/ext/lame/gstlame.c
@@ -38,7 +38,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw-int, "
-        "endianness = (int) BYTE_ORDER, "
+        "endianness = (int) " G_STRINGIFY (G_BYTE_ORDER) ", "
         "signed = (boolean) true, "
         "width = (int) 16, "
         "depth = (int) 16, "
diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c
index 900d17948f..596066dd14 100644
--- a/ext/mad/gstmad.c
+++ b/ext/mad/gstmad.c
@@ -126,15 +126,20 @@ GST_STATIC_PAD_TEMPLATE ("src",
         "signed = (boolean) true, "
         "width = (int) 16, "
         "depth = (int) 16, "
-        "rate = (int) [ 11025, 48000 ], " "channels = (int) [ 1, 2 ]")
+        "rate = (int) { 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, "
+        "channels = (int) [ 1, 2 ]")
     );
 
+/* FIXME: make three caps, for mpegversion 1, 2 and 2.5 */
 static GstStaticPadTemplate mad_sink_template_factory =
 GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/mpeg, "
-        "mpegversion = (int) 1, " "layer = (int) [ 1, 3 ]")
+        "mpegversion = (int) 1, "
+        "layer = (int) [ 1, 3 ], "
+        "rate = (int) { 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, "
+        "channels = (int) [ 1, 2 ]")
     );
 
 static void gst_mad_base_init (gpointer g_class);