diff --git a/ChangeLog b/ChangeLog
index b96e0f1..4417c21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-29  Ben Elliston  <bje@gnu.org>
+
+	Patch from Rainer Tammer <tammer@tammer.net>:
+	* config.guess (*:AIX:*:[4567]): Handle AIX 7.x.
+
 2010-05-20  Maxim Kuvyrkov  <maxim@codesourcery.com>
 
 	* config.sub: Recognize *-linux-android*.
diff --git a/config.guess b/config.guess
index 115f944..4e621ac 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2010-04-03'
+timestamp='2010-07-29'
 
 # 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
@@ -552,7 +552,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000