diff --git a/ChangeLog b/ChangeLog
index 968f7d7b8566d8bb1db8207362a18a65be3f6991..c69f02a16c0d55cf7119bf1c8a5b4ae8f46698fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 22 02:39:24 1997  Richard Henderson  <rth@cygnus.com>
+
+	* configure.in: It's alpha*-...
+
 Sun Dec 21 16:53:12 1997  H.J. Lu  (hjl@gnu.ai.mit.edu)
 
 	* configure.in (host_makefile_frag, target_makefile_frag):
diff --git a/configure.in b/configure.in
index ab563cecbe7277b93d21feaf30d8963586ce07d6..6de0e2cdc9f47ab5dbdf194b74a9ca404e8c550d 100644
--- a/configure.in
+++ b/configure.in
@@ -243,8 +243,8 @@ fi
 # Well, we don't yet, but we will.
 if false && [ "${host}" = "${target}" ] && [ x${enable_shared} = x ]; then
   case "${target}" in
-    alpha-dec-osf*)	enable_shared=yes ;;
-    alpha-*-linux*)	enable_shared=yes ;;
+    alpha*-dec-osf*)	enable_shared=yes ;;
+    alpha*-*-linux*)	enable_shared=yes ;;
     mips-sgi-irix5*)	enable_shared=yes ;;
     *)			enable_shared=no ;;
   esac
@@ -271,7 +271,7 @@ if [ x${shared} = xyes ]; then
     powerpc*-*)
       host_makefile_frag="${host_makefile_frag} config/mh-ppcpic"
       ;;
-    alpha-*-linux*)
+    alpha*-*-linux*)
       host_makefile_frag="${host_makefile_frag} config/mh-elfalphapic"
       ;;
     *)
@@ -498,7 +498,7 @@ case "${target}" in
   *-*-vxworks*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
-  alpha-dec-osf*)
+  alpha*-dec-osf*)
     # ld works, but does not support shared libraries.  emacs doesn't
     # work.  newlib is not 64 bit ready.  I'm not sure about fileutils.
     # gas doesn't generate exception information.
@@ -507,7 +507,7 @@ case "${target}" in
   alpha*-*-*vms*)
     noconfigdirs="$noconfigdirs gdb ld target-newlib target-libgloss"
     ;;
-  alpha-*-linux*)
+  alpha*-*-linux*)
     # newlib is not 64 bit ready
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     # linux has rx in libc
@@ -868,7 +868,7 @@ if [ x${shared} = xyes ]; then
     powerpc*-*)
       target_makefile_frag="${target_makefile_frag} config/mt-ppcpic"
       ;;
-    alpha-*-linux*)
+    alpha*-*-linux*)
       target_makefile_frag="${target_makefile_frag} config/mt-elfalphapic"
       ;;
     *)