diff --git a/ChangeLog b/ChangeLog
index 04d4798..d81e436 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-21  Ben Elliston  <bje@gnu.org>
+
+	From Chris Metcalf <cmetcalf@tilera.com>.
+	* config.guess (tile*:Linux:*:*): New.
+	* testsuite/config-guess.data: Add a test case.
+
 2010-08-13  Ben Elliston  <bje@gnu.org>
 
 	From Thomas YS Liu <nckuhuahua@gmail.com>.
diff --git a/config.guess b/config.guess
index 4e621ac..2852378 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-07-29'
+timestamp='2010-08-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
@@ -968,6 +968,9 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index e3b2596..0b052e1 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -45,3 +45,5 @@ i386	4.2			LynxOS		ignored	i386-unknown-lynxos4.2
 PowerPC	4.2			LynxOS		ignored	powerpc-unknown-lynxos4.2
 i86pc	5.0			AuroraUX	ignored	i386-pc-auroraux5.0
 i86xen	5.0			AuroraUX	ignored	i386-pc-auroraux5.0
+tile	2.6.36			Linux		ignored	tile-tilera-linux-gnu
+tilegx	2.6.36			Linux		ignored	tilegx-tilera-linux-gnu