diff --git a/ChangeLog b/ChangeLog
index ba8041c87f..698265f4e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-06-30  Edward Hervey  <edward@fluendo.com>
+
+	* gst/avi/Makefile.am: (libgstavi_la_LIBADD):
+	Added linking to libgstriff-0.9
+	
+	* ext/mad/gstmad.c: (gst_mad_src_query): 
+	check the format of the upstream query and return query if it's the
+	same format as the requested one.
+
 2005-06-30  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query):
diff --git a/gst/avi/Makefile.am b/gst/avi/Makefile.am
index f07af2acb3..1a8b652b10 100644
--- a/gst/avi/Makefile.am
+++ b/gst/avi/Makefile.am
@@ -12,7 +12,7 @@ noinst_HEADERS = \
 libgstavi_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
 	-I$(top_srcdir)/gst-libs	\
 	-DGETTEXT_PACKAGE="\"gst-plugins\""
-libgstavi_la_LIBADD =
+libgstavi_la_LIBADD = -lgstriff-0.9
 libgstavi_la_LDFLAGS = \
 	$(GST_PLUGIN_LDFLAGS) \
 	$(GST_PLUGINS_BASE_LIBS)