diff --git a/ChangeLog b/ChangeLog
index f311492..eaaacab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-08  Bob Wilson  <bob.wilson@acm.org>
+
+	* config.guess (xtensa:Linux:*:*): New.
+	* testsuite/config-guess.data: Add test case.
+	* testsuite/config-sub.data: Add xtensa-elf and xtensa-linux.
+
 2006-12-08  Kazu Hirata  <kazu@codesourcery.com>
 	    Ben Elliston  <bje@gnu.org>
 
diff --git a/config.guess b/config.guess
index c08cebd..2b03b48 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-11-30'
+timestamp='2006-12-08'
 
 # 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
@@ -951,6 +951,9 @@ EOF
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    xtensa:Linux:*:*)
+    	echo xtensa-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index f8b3a68..4233e61 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -27,3 +27,4 @@ macppc	1.0			MirBSD		ignored	powerpc-unknown-mirbsd1.0
 authenticamd	6.0		Interix		ignored	x86_64-unknown-interix6.0
 SX-8	1.0			SUPER-UX	ignored	sx8-nec-superux1.0
 SX-7	1.0			SUPER-UX	ignored	sx7-nec-superux1.0
+xtensa	2.6.15			Linux		ignored	xtensa-unknown-linux-gnu
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 63f7a69..01bd485 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -107,3 +107,5 @@ sh5el-elf			sh5le-unknown-elf
 sh5el-netbsd			sh5le-unknown-netbsd
 fido-elf			fido-unknown-elf
 fido				fido-unknown-none
+xtensa-elf			xtensa-unknown-elf
+xtensa-linux			xtensa-unknown-linux-gnu