diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cd814f46c60..3beae792cdb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,14 @@
 Sun May  9 07:25:02 1993  Fred Fish  (fnf@cygnus.com)
 
+	* configure.in (hppa*-hp-bsd):  Change to hppa*-hp-bsd*
+	* configure.in (hppa*-hp-hpux):  Change to hppa*-hp-hpux*
+	* configure.in (m68*-hp-bsd):  Change to m68*-hp-bsd*
+	* configure.in (m68*-hp-hpux):  Change to m68*-hp-hpux*
+	* configure.in (hppa*-*-bsd):  Change to hppa*-*-bsd*
+	* configure.in (hppa*-*-hpux):  Change to hppa*-*-hpux*
+	* configure.in (m68*-hp-bsd):  Change to m68*-hp-bsd*
+	* configure.in (m68*-hp-hpux):  Change to m68*-hp-hpux*
+
 	* Makefile.in (VERSION):  Bump to 4.8.6.
 
 Sat May  8 12:36:03 1993  Fred Fish  (fnf@cygnus.com)
diff --git a/gdb/configure.in b/gdb/configure.in
index c456a83a941..b29f19d01c3 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -30,8 +30,8 @@ arm-*-*)		gdb_host=arm ;;
 
 c[12]-*-*)		gdb_host=convex ;;
 
-hppa*-hp-bsd)		gdb_host=hppabsd ;;
-hppa*-hp-hpux)		gdb_host=hppahpux ;;
+hppa*-hp-bsd*)		gdb_host=hppabsd ;;
+hppa*-hp-hpux*)		gdb_host=hppahpux ;;
 
 i[34]86-ncr-*)		gdb_host=ncr3000 ;;
 i[34]86-sequent-*)	gdb_host=symmetry ;;
@@ -59,8 +59,8 @@ m68*-apollo*-sysv*)	gdb_host=apollo68v ;;
 m68*-apollo*-bsd*)	gdb_host=apollo68b ;;
 m68*-att-*)		gdb_host=3b1 ;;
 m68*-cbm-sysv4*)	gdb_host=amix ;;
-m68*-hp-bsd)		gdb_host=hp300bsd ;;
-m68*-hp-hpux)		gdb_host=hp300hpux ;;
+m68*-hp-bsd*)		gdb_host=hp300bsd ;;
+m68*-hp-hpux*)		gdb_host=hp300hpux ;;
 m68*-isi-*)		gdb_host=isi ;;
 m68*-sony-*)		gdb_host=news ;;
 m68*-sun-sunos3*)	gdb_host=sun3os3 ;;
@@ -154,8 +154,8 @@ h8500-*-*)		gdb_target=h8500hms ;;
 
 sh-*-*)			gdb_target=sh ;;
 
-hppa*-*-bsd)		gdb_target=hppabsd ;;
-hppa*-*-hpux)		gdb_target=hppahpux ;;
+hppa*-*-bsd*)		gdb_target=hppabsd ;;
+hppa*-*-hpux*)		gdb_target=hppahpux ;;
 
 i[34]86-sequent-*)	gdb_target=symmetry ;;
 i[34]86-ncr-*)		gdb_target=ncr3000 ;;
@@ -187,8 +187,8 @@ m68000-*-sunos3*)	gdb_target=sun2os3 ;;
 m68000-*-sunos4*)	gdb_target=sun2os4 ;;
 
 m68*-cbm-sysv4*)	gdb_target=amix ;;
-m68*-hp-bsd)		gdb_target=hp300bsd ;;
-m68*-hp-hpux)		gdb_target=hp300hpux ;;
+m68*-hp-bsd*)		gdb_target=hp300bsd ;;
+m68*-hp-hpux*)		gdb_target=hp300hpux ;;
 
 m68*-altos-*)		gdb_target=altos ;;
 m68*-att-*)		gdb_target=3b1 ;;