diff --git a/ChangeLog b/ChangeLog
index 84c82c2..ae34123 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-12-29  Ben Elliston  <bje@gnu.org>
+
+	* config.guess (cris:Linux:*:*): Replace fixed CPU name in the
+	triplet with ${UNAME_MACHINE}, as it is identical.
+	(crisv32:Linux:*:*): Likewise.
+	(frv:Linux:*:*): Likewise.
+	(hexagon:Linux:*:*): Likewise.
+	(or32:Linux:*:*): Likewise.
+	(x86_64:Linux:*:*): Likewise.
+	* testsuite/config-guess.data: Add some missing GNU/Linux tests.
+
 2011-12-29  Ben Elliston  <bje@gnu.org>
 
 	* Makefile (check): Test config.guess before config.sub.
diff --git a/config.guess b/config.guess
index 8152efd..21e5d9a 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011 Free Software Foundation, Inc.
 
-timestamp='2011-11-11'
+timestamp='2011-12-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
@@ -897,16 +897,16 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     hexagon:Linux:*:*)
-	echo hexagon-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -948,7 +948,7 @@ EOF
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
@@ -989,7 +989,7 @@ EOF
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 2aa444e..45285f2 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -8,6 +8,7 @@ authenticamd	6.0		Interix		ignored	x86_64-unknown-interix6.0
 avr32	2.6.15			Linux		ignored	avr32-unknown-linux-gnu
 BePC	1.0			Haiku		ignored	i586-pc-haiku
 crayx1	2.5.20			UNICOS/mp	ignored	craynv-cray-unicosmp2.5.X
+cris	2.6.6			Linux		ignored	cris-axis-linux-gnu
 crisv32	2.6.6			Linux		ignored	crisv32-axis-linux-gnu
 EM64T	5.2			Interix		ignored	x86_64-unknown-interix5.2
 frv	2.4.24			Linux		ignored	frv-unknown-linux-gnu
@@ -47,5 +48,6 @@ vax	2.6.15			Linux		ignored	vax-dec-linux-gnu
 x86	5.2			Interix		ignored	i586-pc-interix5.2
 x86	6.0			Interix		ignored	i586-pc-interix6.0
 x86_64	1.0			MINGW		ignored	x86_64-pc-mingw32
+x86_64	2.6.32			Linux		ignored	x86_64-unknown-linux-gnu
 x86_64	1.5.18(0.132/4/2)	CYGWIN_NT-5.2	ignored	x86_64-unknown-cygwin
 xtensa	2.6.15			Linux		ignored	xtensa-unknown-linux-gnu