diff --git a/ChangeLog b/ChangeLog
index d0872be..0837209 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-30  Melissa Mears  <asterisk@graces.dricas.com>
+
+	* config.sub: Handle xbox alias.
+	* testsuite/config-sub.data: Add xbox case.
+
 2004-11-17  Ian Lance Taylor  <ian@wasabisystems.com>
 	    Ben Elliston  <bje@gnu.org>
 
diff --git a/config.sub b/config.sub
index c5a77c3..0f84ac2 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-17'
+timestamp='2004-11-30'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -1033,6 +1033,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index f959a24..e55b517 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -25,3 +25,4 @@ s390-ibm-zvmoe			s390-ibm-zvmoe
 xscale				xscale-unknown-none
 xscaleeb			xscaleeb-unknown-none
 xscaleel			xscaleel-unknown-none
+xbox				i686-pc-mingw32