diff --git a/ChangeLog b/ChangeLog
index 2e97eccb8c..576bd0345e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-17  Benjamin Otte  <otte@gnome.org>
+
+	* autogen.sh:
+	* configure.ac:
+	* ext/mad/gstid3tag.c: (gst_id3_tag_chain):
+	  compute offsets correctly for internal buffers so timestamps are set
+	  correctly when we can't seek. Also handle cases where there are no
+	  offsets. (based on a patch by David Moore, fixes #142507)
+
 2004-05-17  Benjamin Otte  <otte@gnome.org>
 
 	* ext/alsa/gstalsasink.c: (gst_alsa_sink_loop):
diff --git a/autogen.sh b/autogen.sh
index 8977a618e7..529db45aeb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -72,7 +72,7 @@ fi
 tool_run "$autopoint --force"
 patch -p0 < common/gettext.patch
 
-tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
+tool_run "$aclocal" "-I m4 -I common/m4 -I . $ACLOCAL_FLAGS"
 tool_run "$libtoolize" "--copy --force"
 tool_run "$autoheader"
 
diff --git a/configure.ac b/configure.ac
index fb968f2da2..24a69e9ff5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ 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"
+ACLOCAL_FLAGS="-I m4 -I common/m4 -I ."
 AC_SUBST(ACLOCAL_AMFLAGS, $ACLOCAL_FLAGS)
 
 AC_PROG_CC