diff --git a/ChangeLog b/ChangeLog
index 294c4c9ce0a..a8a5f8a613f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 17 01:22:30 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* config.sub: Handle hppa2.0.
+
 Fri Dec  4 01:34:02 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* config.guess: Improve detection of hppa2.0 processors.
diff --git a/config.sub b/config.sub
index 02d959dfa88..7a84e41198c 100755
--- a/config.sub
+++ b/config.sub
@@ -164,7 +164,7 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
 		| arme[lb] | pyramid | mn10200 | mn10300 \
-		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
+		| tron | a29k | 580 | i960 | h8300 | hppa | hppa* \
 		| alpha | alphaev5 | alphaev56 | alphapca56 | alphaev6 \
 		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
 		| 1750a | dsp16xx | pdp11 \
@@ -210,7 +210,7 @@ case $basic_machine in
 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
-	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
+	      | xmp-* | ymp-* | hppa-* | hppa*-* \
 	      | alpha-* | alphaev5-* | alphaev56-* | alphapca56-* \
 	      | alphaev6-* | we32k-* | cydra-* | ns16k-* | pn-* | np1-* \
 	      | xps100-* | clipper-* | orion-* \