diff --git a/acconfig.h b/acconfig.h
index 265d2228e8..b6e24c4221 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,5 +1,7 @@
 #undef PACKAGE
 #undef VERSION
+#undef GST_PLUGINS
+#undef GST_PLUGINS_RELEASE
 #undef GST_VERSION_RELEASE
 
 /* Gettext stuff */
diff --git a/autogen.sh b/autogen.sh
index a7c1246475..96dea9cde4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -38,7 +38,7 @@ fi
 
 toplevel_check $srcfile
 
-tool_run "aclocal" "-I common/m4 $ACLOCAL_FLAGS"
+tool_run "aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
 
 # FIXME : why does libtoolize keep complaining about aclocal ?
 
diff --git a/configure.ac b/configure.ac
index 88ddbfa509..61b6c4cc02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,6 @@ AC_CANONICAL_TARGET([])
 dnl when going to/from release please set the nano (fourth number) right !
 AS_VERSION(gst-plugins, GST_PLUGINS, 0, 3, 2, 1)
 
-
 dnl FIXME take something else ?
 AC_CONFIG_SRCDIR([gst/law/alaw.c])
 AM_CONFIG_HEADER(config.h)
diff --git a/tools/gst-launch-ext b/tools/gst-launch-ext
index 3e088d2318..7c91fe050e 100755
--- a/tools/gst-launch-ext
+++ b/tools/gst-launch-ext
@@ -85,7 +85,7 @@ read_config ();
   "ogg", "vorbisdec ! $cfg{AUDIOSINK}",
   "vis.ogg", "vorbisdec ! tee silent=true 'tee0.src0!' queue ! { $cfg{VISUALIZER} ! colorspace ! $cfg{VIDEOSINK} } 'tee0.src1!' $cfg{AUDIOSINK}",
   "mpg", "mpegdemux video_00! { queue ! mpeg2dec ! $cfg{VIDEOSINK} } mpegdemux0.audio_00! { queue ! mad ! $cfg{AUDIOSINK} }",
-  "avi", "avidemux video_00! { queue ! windec ! $cfg{VIDEOSINK} }",
+  "avi", "avidemux video_00! { queue ! windec ! $cfg{VIDEOSINK} } avidemux0.audio_00! { queue ! mad ! $cfg{AUDIOSINK} }",
   "vob", "mpegdemux video_00! { queue ! mpeg2dec ! $cfg{VIDEOSINK} } mpegdemux0.audio_00! { queue ! a52dec ! $cfg{AUDIOSINK} }",
   "wav", "wavparse ! $cfg{AUDIOSINK}",
   "vis.wav", "wavparse ! tee silent=true 'tee0.src0!' queue ! { $cfg{VISUALIZER} ! colorspace ! $cfg{VIDEOSINK} } 'tee0.src1!' $cfg{AUDIOSINK}",