diff --git a/ChangeLog b/ChangeLog
index 2df6af1..34d8cb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-08  Ben Elliston  <bje@gnu.org>
+
+	From Chris Metcalf <cmetcalf@tilera.com>:
+	* config.sub: Handle tile-*.
+	* testsuite/config-sub.data: Add a test.
+
 2008-02-05  Adam Nemet  <anemet@caviumnetworks.com>
 	    Ben Elliston  <bje@gnu.org>
 
diff --git a/config.sub b/config.sub
index de5d6a7..0f295d9 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2008-02-05'
+timestamp='2008-03-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -368,7 +368,7 @@ case $basic_machine in
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index ee4af6f..c3045a1 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -121,6 +121,7 @@ parisc				hppa-unknown-linux-gnu
 tile				tile-unknown-linux-gnu
 tile64				tile-unknown-linux-gnu
 tile-linux			tile-unknown-linux-gnu
+tile-tilera-linux		tile-tilera-linux-gnu
 mips64r5900-elf			mips64r5900-unknown-elf
 mips64r5900el-elf		mips64r5900el-unknown-elf
 mips64r5900			mips64r5900-unknown-elf