diff --git a/ChangeLog b/ChangeLog
index 2f73c60f03..bd63b6145f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2004-04-13  David Schleef  <ds@schleef.org>
+
+	* common/m4/gst-feature.m4: Call -config scripts with
+	--plugin-libs if it is supported.
+	* gst/avi/gstavimux.c: (gst_avimux_vidsinkconnect): sequences of
+	JPEG images are image/jpeg.
+	* gst/debug/Makefile.am:
+	* gst/debug/negotiation.c: (gst_negotiation_class_init),
+	(gst_negotiation_getcaps), (gst_negotiation_pad_link),
+	(gst_negotiation_update_caps), (gst_negotiation_get_property),
+	(gst_negotiation_plugin_init): Add a property that acts like
+	filter caps.
+	* testsuite/gst-lint:  Move license checking to be a standard
+	test.
+
 2004-04-13  David Schleef  <ds@schleef.org>
 
 	* gst/avi/gstavidemux.c: (gst_avi_demux_reset): Fix memleak.
diff --git a/common b/common
index 99901894a4..c4fb9e5b7b 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 99901894a48091bfed16826702c38c4063e64954
+Subproject commit c4fb9e5b7bc69f9420a0f008230e3028fdc2b097
diff --git a/tests/old/testsuite/gst-lint b/tests/old/testsuite/gst-lint
index 710ce9bbb8..c385acd06f 100755
--- a/tests/old/testsuite/gst-lint
+++ b/tests/old/testsuite/gst-lint
@@ -76,10 +76,10 @@ foreach $filename (<FIND>) {
 	check_signals();
 
 	# less important stuff
+	check_license();
 
 if (0) {
 	check_copyright();
-	check_license();
 
     check_gnuc_const();
 	check_begin_decls();
diff --git a/testsuite/gst-lint b/testsuite/gst-lint
index 710ce9bbb8..c385acd06f 100755
--- a/testsuite/gst-lint
+++ b/testsuite/gst-lint
@@ -76,10 +76,10 @@ foreach $filename (<FIND>) {
 	check_signals();
 
 	# less important stuff
+	check_license();
 
 if (0) {
 	check_copyright();
-	check_license();
 
     check_gnuc_const();
 	check_begin_decls();