diff --git a/ChangeLog b/ChangeLog
index 341c887384a..beb9a01999c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Sep  1 16:45:44 1997  Jim Wilson  <wilson@cygnus.com>
+
+	* configure.in (target_subdir): Set to libraries if enable_multilib.
+
 Wed Aug 27 16:15:11 1997  Jim Wilson  <wilson@cygnus.com>
 
 	* config.guess: Update from gcc directory.
diff --git a/configure.in b/configure.in
index e251e85b424..70d8a87ec51 100644
--- a/configure.in
+++ b/configure.in
@@ -244,12 +244,12 @@ if [ x"${host}" = x"${target}" ] ; then
 	# that are in the 'cross only' list
 	skipdirs="${skipdirs} ${cross_only}"
 	is_cross_compiler=no
-	target_subdir=.
-	case "${host}" in
-          # We need multilib support for irix6, to get libiberty built
-	  #  properly for o32 and n32.
-          mips-sgi-irix6*) target_subdir=${host} ;;
-	esac
+	# Default to --enable-multilib.  See similar code below.
+	if [ x${enable_multilib} = xno ]; then
+	  target_subdir=.
+	else
+	  target_subdir=libraries
+	fi
 else
 	# similarly, don't build the targets in the 'native only' 
 	# list when building a cross compiler