diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index f8e1c9c5bff4d996d9c215c204642e17d4477866..53c8eecdecb901dedc5b3bb9d82aa627368768c6 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-02  Paolo Bonzini  <bonzini@gnu.org> 
+
+	* configure.ac: Do not enable multilibs for build-side libiberty.
+
 2004-06-29  Danny Smith  <dannysmith@users.sourceforge.net> 
 
 	* lrealpath.c (lrealpath): Add _WIN32 support.
diff --git a/libiberty/configure.ac b/libiberty/configure.ac
index 42fe85d2e6f50306d35ca9131c0334e8415dacac..d6eb26fa28442e81010bf2983157b8b9c8e3d8cd 100644
--- a/libiberty/configure.ac
+++ b/libiberty/configure.ac
@@ -546,7 +546,7 @@ AC_CONFIG_FILES([Makefile testsuite/Makefile])
 AC_CONFIG_COMMANDS([default],
   [[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
 if test -n "$CONFIG_FILES"; then
-  if test -n "${with_build_subdir}" || test -n "${with_target_subdir}"; then
+  if test -n "${with_target_subdir}"; then
     # FIXME: We shouldn't need to set ac_file
     ac_file=Makefile
     LD="${ORIGINAL_LD_FOR_MULTILIBS}"
@@ -557,7 +557,6 @@ fi]],
 host=${host}
 target=${target}
 with_target_subdir=${with_target_subdir}
-with_build_subdir=${with_build_subdir}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="--enable-multilib ${ac_configure_args}"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}