diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8132ef2ffd..a3c6308d59 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+Wed Oct  8 12:33:32 1997  Richard Henderson  <rth@cygnus.com>
+
+	* configure.in: Change alpha-*-* to alpha*-*-*; config.guess now
+	recognizes alphaev5 etc.
+	* configure: Rebuild.
+
 Wed Oct  8 00:04:05 1997  Gavin Koch  <gavin@cygnus.com>
 
 	* config/tc-mips.c (md_begin): Replace the TARGET_CPU value
diff --git a/gas/configure b/gas/configure
index 64cef7e0cb..f75f7529f3 100755
--- a/gas/configure
+++ b/gas/configure
@@ -1292,6 +1292,7 @@ for this_target in $target $canon_targets ; do
     arch=
     endian=
     case ${cpu} in
+      alpha*)		cpu_type=alpha ;;
       armeb)		cpu_type=arm endian=big ;;
       arm*)		cpu_type=arm endian=little ;;
       thumb*)		cpu_type=arm endian=little ;;
@@ -1345,12 +1346,12 @@ EOF
       a29k-nyu-sym1)        fmt=coff ;;
       a29k-*-vxworks*)      fmt=coff ;;
 
-      alpha-*-*vms*)	    fmt=evax ;;
-      alpha-*-netware*)     fmt=ecoff ;;
-      alpha-*-openbsd*)     fmt=ecoff ;;
-      alpha-*-osf*)         fmt=ecoff ;;
-      alpha-*-linuxecoff*)  fmt=ecoff ;;
-      alpha-*-linux*)       fmt=elf em=linux ;;
+      alpha*-*-*vms*)	    fmt=evax ;;
+      alpha*-*-netware*)    fmt=ecoff ;;
+      alpha*-*-openbsd*)    fmt=ecoff ;;
+      alpha*-*-osf*)        fmt=ecoff ;;
+      alpha*-*-linuxecoff*) fmt=ecoff ;;
+      alpha*-*-linux*)      fmt=elf em=linux ;;
 
       arc-*-elf*)           fmt=elf bfd_gas=yes ;;
 
diff --git a/gas/configure.in b/gas/configure.in
index fcbe94f481..085efda136 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -69,6 +69,7 @@ changequote([,])dnl
     arch=
     endian=
     case ${cpu} in
+      alpha*)		cpu_type=alpha ;;
       armeb)		cpu_type=arm endian=big ;;
       arm*)		cpu_type=arm endian=little ;;
       thumb*)		cpu_type=arm endian=little ;;
@@ -118,12 +119,12 @@ changequote([,])dnl
       a29k-nyu-sym1)        fmt=coff ;;
       a29k-*-vxworks*)      fmt=coff ;;
 
-      alpha-*-*vms*)	    fmt=evax ;;
-      alpha-*-netware*)     fmt=ecoff ;;
-      alpha-*-openbsd*)     fmt=ecoff ;;
-      alpha-*-osf*)         fmt=ecoff ;;
-      alpha-*-linuxecoff*)  fmt=ecoff ;;
-      alpha-*-linux*)       fmt=elf em=linux ;;
+      alpha*-*-*vms*)	    fmt=evax ;;
+      alpha*-*-netware*)    fmt=ecoff ;;
+      alpha*-*-openbsd*)    fmt=ecoff ;;
+      alpha*-*-osf*)        fmt=ecoff ;;
+      alpha*-*-linuxecoff*) fmt=ecoff ;;
+      alpha*-*-linux*)      fmt=elf em=linux ;;
 
       arc-*-elf*)           fmt=elf bfd_gas=yes ;;
 
@@ -314,7 +315,7 @@ changequote([,])dnl
     esac
 
     case ${cpu_type}-${fmt} in
-      alpha-*)	bfd_gas=yes ;;
+      alpha*-*)	bfd_gas=yes ;;
       arm-*)	bfd_gas=yes ;;
     # not yet
     # i386-aout)	bfd_gas=preferred ;;