diff --git a/ChangeLog b/ChangeLog
index ce25e5231c..d24c5c2ffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Apr 28 18:11:24 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: Change alpha to alpha* in several places.
+
 Tue Apr 28 07:42:00 1998  Mark Alexander  <marka@cygnus.com>
 
 	* config.sub: Recognize sparc86x.
diff --git a/configure.in b/configure.in
index 4044a8b513..4bb99cfe8f 100644
--- a/configure.in
+++ b/configure.in
@@ -260,8 +260,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
@@ -291,7 +291,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"
       ;;
     *)
@@ -577,7 +577,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.
@@ -586,7 +586,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
@@ -1006,7 +1006,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"
       ;;
     *)