diff --git a/ChangeLog b/ChangeLog
index 49b141b..a9faab3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-31  Ben Elliston  <bje@redhat.com>
+
+	* config.guess: Handle hppa64-linux systems. From Alan Modra
+	<alan@linuxcare.com.au>.
+
 2001-01-29  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
 
 	* config.guess: Specifically identify 4.3BSD and 4.3BSD-Reno in
diff --git a/config.guess b/config.guess
index 15e6184..b60b5a0 100755
--- a/config.guess
+++ b/config.guess
@@ -929,6 +929,8 @@ EOF
 	  echo s390-ibm-linux && exit 0
 	elif test "${UNAME_MACHINE}" = "x86_64"; then
 	  echo x86_64-unknown-linux-gnu && exit 0
+	elif test "${UNAME_MACHINE}" = "parisc64" -o "${UNAME_MACHINE}" = "hppa64"; then
+	  echo hppa64-unknown-linux-gnu && exit 0
 	elif test "${UNAME_MACHINE}" = "parisc" -o "${UNAME_MACHINE}" = "hppa"; then
 	  # Look for CPU level
 	  case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in