diff --git a/ChangeLog b/ChangeLog
index 1e92603f8..240c61ca7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-01  Michael Livshin  <mlivshin@bigfoot.com>
+
+	* autogen.sh: call ./guile-aclocal.sh instead of aclocal.
+	
+	* guile-aclocal.sh: new file, works around aclocal problems.
+
 2000-05-30  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
 	* acconfig.h (USE_FSU_PTHREADS, USE_MIT_PTHREADS,
diff --git a/autogen.sh b/autogen.sh
index 78c60dbc3..c3498d0cb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,7 +5,8 @@
   exit 1
 }
 
-aclocal -I .
+./guile-aclocal.sh
+
 libtoolize --copy --automake --ltdl
 autoheader
 autoconf
diff --git a/guile-aclocal.sh b/guile-aclocal.sh
new file mode 100755
index 000000000..d0b49c746
--- /dev/null
+++ b/guile-aclocal.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+temp=/tmp/guile-aclocal.$$
+trap "rm -rf $temp" 0 1 2 15
+
+mkdir $temp
+[ -d $temp ] || {
+  echo "guile-aclocal.sh: cannot create temp directory"
+  exit 1
+}
+
+# copy all installed aclocal files into $temp
+cp `aclocal --print-ac-dir`/*.m4 $temp
+
+# remove the .m4 files installed by Guile from $temp, so they don't
+# cause conflicts
+rm -f ${temp}/guile.m4 ${temp}/qthreads.m4
+
+aclocal --acdir=$temp -I .
diff --git a/guile-readline/ChangeLog b/guile-readline/ChangeLog
index b6f88e516..0ff562bc7 100644
--- a/guile-readline/ChangeLog
+++ b/guile-readline/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-01  Michael Livshin  <mlivshin@bigfoot.com>
+
+	* autogen.sh: call ../guile-aclocal.sh instead of aclocal
+	
 2000-05-01  Gary Houston  <ghouston@arglist.com>
 
 	* readline.c: include libguile.h, not libguile/libguile.h.
diff --git a/guile-readline/autogen.sh b/guile-readline/autogen.sh
index 9ab3d7726..b3585c142 100755
--- a/guile-readline/autogen.sh
+++ b/guile-readline/autogen.sh
@@ -5,7 +5,8 @@
   exit 1
 }
 
-aclocal -I .
+../guile-aclocal.sh
+
 libtoolize --copy --automake
 autoconf
 automake --add-missing