diff --git a/ChangeLog b/ChangeLog
index 0e57d7fbe..7e5559ecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-24  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in: Use the same cache file for all target libs.
+	* config-ml.in: But different cache files per multilib variant.
+
 2000-07-23  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
 
 	* configure (topsrcdir): Don't use dirname.
diff --git a/config-ml.in b/config-ml.in
index 60b1d2c1f..e5ca10ec1 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -742,7 +742,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
     cd ${ml_dir}/${ml_libdir}
 
     if [ -f ${ml_newsrcdir}/configure ]; then
-      ml_recprog=${ml_newsrcdir}/configure
+      ml_recprog="${ml_newsrcdir}/configure --cache-file=../config.cache"
     fi
 
     # find compiler flag corresponding to ${ml_dir}
diff --git a/configure.in b/configure.in
index f371c105e..56c5d7b5d 100644
--- a/configure.in
+++ b/configure.in
@@ -1213,7 +1213,7 @@ else
   gxx_include_dir=${gxx_include_dir}
 fi
 
-targargs="--host=${target_alias} --build=${build_alias} ${targargs}"
+targargs="--cache-file=../config.cache --host=${target_alias} --build=${build_alias} ${targargs}"
 sed -e "s:^TARGET_CONFIGDIRS[ 	]*=.*$:TARGET_CONFIGDIRS = ${target_configdirs}:" \
     -e "s%^CONFIG_ARGUMENTS[ 	]*=.*$%CONFIG_ARGUMENTS = ${targargs}%" \
     -e "s%^TARGET_SUBDIR[ 	]*=.*$%TARGET_SUBDIR = ${target_subdir}%" \