diff --git a/ChangeLog b/ChangeLog
index f2a3c0d..049d666 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-21  Ben Elliston  <bje@redhat.com>
+
+	* config.guess: Detect HP-UX on IA-64 hosts.  From Jonathan
+	Thackray <jon@thackray.org>.
+
 2000-12-20  Pavel Roskin  <proski@gnu.org>
 
 	* config.sub: Handle mint with version number as recognized OS.
diff --git a/config.guess b/config.guess
index a01e874..54936b2 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
 
-timestamp='2000-12-20'
+timestamp='2000-12-21'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -599,6 +599,10 @@ EOF
 	esac
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit 0 ;;
     3050*:HI-UX:*:*)
 	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>