diff --git a/ChangeLog b/ChangeLog
index db74590..d0872be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-17  Ian Lance Taylor  <ian@wasabisystems.com>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.sub: Recognize xscalee[bl].
+	* testsuite/config-sub.data: Add xscale, xscalee[bl] cases.
+
 2004-11-12  Ben Elliston  <bje@gnu.org>
 
 	* config.guess (*:z/VM:*:*): Add new case.
diff --git a/config.sub b/config.sub
index ab72d85..c5a77c3 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2004-11-12'
+timestamp='2004-11-17'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -267,7 +267,7 @@ case $basic_machine in
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -343,8 +343,8 @@ case $basic_machine in
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index f7d7637..f959a24 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -22,3 +22,6 @@ crisv32-linux			crisv32-axis-linux-gnu
 frv-linux			frv-unknown-linux-gnu
 djgpp				i586-pc-msdosdjgpp
 s390-ibm-zvmoe			s390-ibm-zvmoe
+xscale				xscale-unknown-none
+xscaleeb			xscaleeb-unknown-none
+xscaleel			xscaleel-unknown-none