diff --git a/ChangeLog b/ChangeLog
index e34642894f..a623bf69b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2004-03-15  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* configure.ac:
+          don't set ACLOCAL_FLAGS !
+	* gst-libs/ext/ffmpeg/.cvsignore:
+	* gst-libs/ext/ffmpeg/patches/cvsignore.patch:
+          trying to add configure to be ignored
+
+2004-03-15  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	reviewed by: <delete if not using a buddy>
+
+	* gst-libs/ext/ffmpeg/.cvsignore:
+	* gst-libs/ext/ffmpeg/patches/cvsignore.patch:
+
 2004-03-15  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst-libs/ext/ffmpeg/m4/vorbis.m4:
diff --git a/configure.ac b/configure.ac
index 84172ab454..c4279b80ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,9 +39,7 @@ AC_CONFIG_SRCDIR(configure.ac)
 AM_CONFIG_HEADER(config.h)
 
 dnl Add parameters for aclocal
-dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL)
-ACLOCAL_FLAGS="-I m4 -I common/m4"
-AC_SUBST(ACLOCAL_AMFLAGS, $ACLOCAL_FLAGS)
+AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I common/m4 $ACLOCAL_FLAGS")
 
 AC_PROG_CC
 AM_PROG_CC_STDC