diff --git a/ChangeLog b/ChangeLog
index 8ca1253..6818033 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-05-30  Chris Metcalf  <cmetcalf@tilera.com>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.guess (tile*:Linux:*:*): Use vendor "unknown", not
+	"tilera", for consistency with other architectures.
+	* config.sub (tile*-*, tilegx-*): Use a more general pattern for
+	"tile" to allow matching tilepro, tilegx32 and other variants.
+	* testsuite/config-guess.data: Update tests.
+	* testsuite/config-sub.data: Likewise.
+
 2011-05-11  Hector Oron  <zumbi@debian.org>
 	    Konstantinos Margaritis  <markos@debian.org>
 
diff --git a/config.guess b/config.guess
index 40eaed4..ea5f06f 100755
--- a/config.guess
+++ b/config.guess
@@ -978,7 +978,7 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
diff --git a/config.sub b/config.sub
index 30fdca8..fd99c46 100755
--- a/config.sub
+++ b/config.sub
@@ -408,7 +408,7 @@ case $basic_machine in
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
@@ -1120,13 +1120,8 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	# This must be matched before tile*.
-	tilegx*)
-		basic_machine=tilegx-unknown
-		os=-linux-gnu
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 41a2f60..c9c83dc 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -45,7 +45,7 @@ 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
+tile	2.6.36			Linux		ignored	tile-unknown-linux-gnu
+tilegx	2.6.36			Linux		ignored	tilegx-unknown-linux-gnu
 NEO-1	1.0			NONSTOP_KERNEL	ignored	neo-tandem-nsk1.0
 NSE-1	1.0			NONSTOP_KERNEL	ignored	nse-tandem-nsk1.0
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index b66b1f4..d706c90 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -119,12 +119,12 @@ blackfin			bfin-unknown-linux-gnu
 m68knommu			m68k-unknown-linux-gnu
 parisc				hppa-unknown-linux-gnu
 tile				tile-unknown-linux-gnu
-tile64				tile-unknown-linux-gnu
+tile64				tile64-unknown-linux-gnu
 tile-linux			tile-unknown-linux-gnu
-tile-tilera-linux		tile-tilera-linux-gnu
+tile-unknown-linux		tile-unknown-linux-gnu
 tilegx				tilegx-unknown-linux-gnu
 tilegx-linux			tilegx-unknown-linux-gnu
-tilegx-tilera-linux		tilegx-tilera-linux-gnu
+tilegx-unknown-linux		tilegx-unknown-linux-gnu
 mips64r5900-elf			mips64r5900-unknown-elf
 mips64r5900el-elf		mips64r5900el-unknown-elf
 mips64r5900			mips64r5900-unknown-elf