diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 87d9a98496..8c4b0a8ceb 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct  3 14:02:17 1997  Richard Henderson  <rth@cygnus.com>
+
+	* config.bfd: Change alpha-*-* to alpha*-*-*; config.guess now
+	recognizes alphaev5 etc.
+	* configure.host: Likewise.
+	
 Fri Oct  3 11:23:47 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	Make ld -s work on AIX:
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 1488ef4d30..9fabfdacb6 100755
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -50,22 +50,22 @@ esac
 case "${targ}" in
 # START OF targmatch.h
 #ifdef BFD64
-  alpha-*-netware*)
+  alpha*-*-netware*)
     targ_defvec=ecoffalpha_little_vec
     targ_selvecs=nlm32_alpha_vec
     ;;
-  alpha-*-linuxecoff*)
+  alpha*-*-linuxecoff*)
     targ_defvec=ecoffalpha_little_vec
     targ_selvecs=bfd_elf64_alpha_vec
     ;;
-  alpha-*-linux* | alpha-*-elf*)
+  alpha*-*-linux* | alpha*-*-elf*)
     targ_defvec=bfd_elf64_alpha_vec
     targ_selvecs=ecoffalpha_little_vec
     ;;
-  alpha-*-*vms*)
+  alpha*-*-*vms*)
     targ_defvec=evax_alpha_vec
     ;;
-  alpha-*-*)
+  alpha*-*-*)
     targ_defvec=ecoffalpha_little_vec
     ;;
 #endif /* BFD64 */
@@ -470,7 +470,7 @@ case "${targ}" in
     targ_defvec=rs6000coff_vec
     ;;
 
-  sh-*-elf*)
+  sh-*-elf* | sh-*-rtems*)
     targ_defvec=bfd_elf32_sh_vec
     targ_selvecs="bfd_elf32_shl_vec shcoff_vec shlcoff_vec"
     targ_underscore=yes
@@ -554,12 +554,10 @@ case "${targ}" in
   v850e-*-*)
     targ_defvec=bfd_elf32_v850_vec
     ;;
-# end-sanitize-v850e
-# start-sanitize-v850eq
   v850eq-*-*)
     targ_defvec=bfd_elf32_v850_vec
     ;;
-# end-sanitize-v850eq
+# end-sanitize-v850e
 #if HAVE_host_aout_vec
   vax-*-bsd* | vax-*-ultrix*)
     targ_defvec=host_aout_vec