diff --git a/ChangeLog b/ChangeLog
index 73413fcb0..9f3b87388 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-22  Han-Wen  <hanwen@cs.uu.nl>
+
+	* autogen.sh (mscripts): find and check version number of
+	automake. Complain if 1.6 is not found.
+
 2002-07-20  Han-Wen  <hanwen@cs.uu.nl>
 
 	* autogen.sh (mscripts): find and check version number of
diff --git a/autogen.sh b/autogen.sh
index ef7b58af8..f06a127ac 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -100,6 +100,24 @@ if test -z "$autoconf"; then
     echo "ERROR: Please install autoconf 2.53"
     exit 1
 fi
+################################################################
+
+#detect automake version
+
+
+# configure.in reqs autoconf-2.53; try to find it
+for suf in "-1.6" "1.6" ""  false; do
+  version=`automake$suf --version 2>/dev/null | head -1 | awk '{print $NF}' | awk -F. '{print $1 * 10 + $2}'`
+  if test "0$version" -eq 16; then
+    automake=automake$suf
+    break
+  fi
+done
+
+if test -z "$automake"; then
+    echo "ERROR: Please install automake 1.6.x"
+    exit 1
+fi
 
 
 ################################################################
@@ -110,15 +128,15 @@ $autoconf
 # file.  We need two mdate-sh, tho, one in doc/ref/ and one in
 # doc/tutorial/.  We run automake twice as a workaround.
 
-automake --add-missing
-automake --add-missing
+$automake --add-missing
+$automake --add-missing
 
 # Make sure that libltdl uses the same autoconf version as the rest.
 #
 echo "libltdl..."
 (cd libltdl && aclocal)
 (cd libltdl && autoconf)
-(cd libltdl && automake --gnu --add-missing)
+(cd libltdl && $automake --gnu --add-missing)
 
 echo "guile-readline..."
 (cd guile-readline && ./autogen.sh)
diff --git a/libguile/goops.c b/libguile/goops.c
index 7ff530d1d..8017cffa3 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -1872,7 +1872,7 @@ scm_compute_applicable_methods (SCM gf, SCM args, long len, int find_method_p)
       return SCM_BOOL_F;
     }
 
-  scm_remember_upto_here (tmp);
+  scm_remember_upto_here_1 (tmp);
   return (count == 1
 	  ? applicable
 	  : sort_applicable_methods (applicable, count, types));