diff --git a/ChangeLog b/ChangeLog
index 48cf8559..0ba4b7bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-03-10  Ben Elliston  <bje@cygnus.com>
+
+	* config.guess: Recognise HP 9000/800. Merged from the master
+	FSF version of this file.
+
 1999-02-28  Ben Elliston  <bje@cygnus.com>
 
 	* acspecific.m4 (AC_FUNC_VFORK): Allow test to behave correctly
diff --git a/config.guess b/config.guess
index 490003df..e26f7641 100755
--- a/config.guess
+++ b/config.guess
@@ -374,7 +374,7 @@ EOF
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 )
+	    9000/6?? | 9000/7?? | 9000/80[024] | 9000/8?[13679] | 9000/892 )
               sed 's/^              //' << EOF >$dummy.c
               #include <stdlib.h>
               #include <unistd.h>