diff --git a/ChangeLog b/ChangeLog
index f3565d2..ac6799c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-22  Chris Metcalf  <cmetcalf@tilera.com>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.sub: Handle tilegx-*.
+	* testsuite/config-sub.data: Add a test.
+
 2009-12-31  David Barksdale <amatus@google.com>
 	    Ben Elliston  <bje@gnu.org>
 
diff --git a/config.sub b/config.sub
index 8518609..c2d1257 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
-timestamp='2009-12-31'
+timestamp='2010-01-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -381,7 +381,8 @@ case $basic_machine in
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile-* | tilegx-* \
 	| tron-* \
 	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
@@ -1086,6 +1087,11 @@ case $basic_machine in
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+        # This must be matched before tile*.
+        tilegx*)
+		basic_machine=tilegx-unknown
+		os=-linux-gnu
+		;;
 	tile*)
 		basic_machine=tile-unknown
 		os=-linux-gnu
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 221bcd0..a579755 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -122,6 +122,9 @@ tile				tile-unknown-linux-gnu
 tile64				tile-unknown-linux-gnu
 tile-linux			tile-unknown-linux-gnu
 tile-tilera-linux		tile-tilera-linux-gnu
+tilegx				tilegx-unknown-linux-gnu
+tilegx-linux			tilegx-unknown-linux-gnu
+tilegx-tilera-linux		tilegx-tilera-linux-gnu
 mips64r5900-elf			mips64r5900-unknown-elf
 mips64r5900el-elf		mips64r5900el-unknown-elf
 mips64r5900			mips64r5900-unknown-elf