diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 45474947e8..f7e60c3c43 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-14  H.J. Lu <hjl@gnu.org>
+
+	* config.bfd: Always add 64bit vectors to 32bit Linux/mips.
+
 2002-08-14  Stephane Carrez  <stcarrez@nerim.fr>
 
 	* elf32-m68hc11.c (m68hc11_relax_group): New to relax group of
diff --git a/bfd/config.bfd b/bfd/config.bfd
index efc3655463..aa09499ac9 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -759,13 +759,11 @@ case "${targ}" in
 #endif
   mips*el-*-linux*)
     targ_defvec=bfd_elf32_tradlittlemips_vec
-    targ_selvecs="bfd_elf32_tradbigmips_vec ecoff_little_vec ecoff_big_vec"
-    targ64_selvecs="bfd_elf32_ntradlittlemips_vec bfd_elf64_tradlittlemips_vec bfd_elf32_ntradbigmips_vec bfd_elf64_tradbigmips_vec"
+    targ_selvecs="bfd_elf32_tradbigmips_vec ecoff_little_vec ecoff_big_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradlittlemips_vec bfd_elf32_ntradbigmips_vec bfd_elf64_tradbigmips_vec"
     ;;
   mips*-*-linux*)
     targ_defvec=bfd_elf32_tradbigmips_vec
-    targ_selvecs="bfd_elf32_tradlittlemips_vec ecoff_big_vec ecoff_little_vec"
-    targ64_selvecs="bfd_elf32_ntradbigmips_vec bfd_elf64_tradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradlittlemips_vec"
+    targ_selvecs="bfd_elf32_tradlittlemips_vec ecoff_big_vec ecoff_little_vec bfd_elf32_ntradbigmips_vec bfd_elf64_tradbigmips_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradlittlemips_vec"
     ;;
 #ifdef BFD64
   mmix-*-*)
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 49001d70d8..0a494c92cd 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-14  H.J. Lu <hjl@gnu.org>
+
+	* configure.tgt: Always enable 64bit emulations for 32bit
+	Linux/mips.
+
 2002-08-13  Alan Modra  <amodra@bigpond.net.au>
 
 	* emulparams/elf32_dlx.sh (TARGET_PAGE_SIZE): Set to 1.
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 5ef6beff88..ffa735c89e 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -399,16 +399,10 @@ mips64*-*-linux-gnu*)	targ_emul=elf32btsmipn32
 			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
 			;;
 mips*el-*-linux-gnu*)	targ_emul=elf32ltsmip
-			targ_extra_emuls="elf32btsmip"
-			if test x${want64} = xtrue; then
-			  targ_extra_emuls="$targ_extra_emuls elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"
-			fi
+			targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"
 			;;
 mips*-*-linux-gnu*)	targ_emul=elf32btsmip
-			targ_extra_emuls="elf32ltsmip"
-			if test x${want64} = xtrue; then
-			  targ_extra_emuls="$targ_extra_emuls elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip"
-			fi
+			targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip"
 			;;
 mips*-*-lnews*)		targ_emul=mipslnews ;;
 mips*-*-sysv4*)         targ_emul=elf32btsmip ;;