diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL
index 48a05688556e..fd0cdabae90f 100644
--- a/sys/arch/i386/conf/ALL
+++ b/sys/arch/i386/conf/ALL
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.157 2008/01/21 22:12:00 ichiro Exp $
+# $NetBSD: ALL,v 1.158 2008/01/23 00:12:03 jmcneill Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"ALL-$Revision: 1.157 $"
+#ident 		"ALL-$Revision: 1.158 $"
 
 maxusers	32		# estimated number of users
 
@@ -43,6 +43,9 @@ options 	VIA_PADLOCK
 # Intel(R) On Demand Clock Modulation (aka ODCM)
 options 	INTEL_ONDEMAND_CLOCKMOD
 
+# XBOX support
+options		XBOX
+
 options 	MTRR		# memory-type range register syscall support
 # doesn't work with MP just yet..
 options 	PERFCTRS	# performance-monitoring counters support
@@ -541,8 +544,12 @@ options 	VESAFB_PM		# power management support
 wsdisplay*	at vesafb? console ?
 
 # VIA Unichrome framebuffer console
-unichromefb*   at pci? dev ? function ?
-wsdisplay*     at unichromefb?
+unichromefb*	at pci? dev ? function ?
+wsdisplay*	at unichromefb?
+
+# XBOX framebuffer console
+xboxfb0		at pci? dev ? function ?
+wsdisplay*	at xboxfb? console ?
 
 # DRI driver
 i915drm*	at vga?		# Intel i915, i945 DRM driver
@@ -640,6 +647,9 @@ adt7463c* at iic? addr 0x2C		# Unknown other motherboard(s)
 adt7463c* at iic? addr 0x2D		# Tyan S2881
 adt7463c* at iic? addr 0x2E		# Tyan S2882-D
 
+pic16lc*	at iic? addr 0x10	# XBOX PIC16LC
+xbseeprom*	at iic? addr 0x54	# XBOX serial EEPROM
+
 # IBM Thinkpad Active Protection System
 aps0 	at isa? port 0x1600
 
@@ -1201,6 +1211,10 @@ uyap* at uhub? port ?
 udsbr*	at uhub? port ?
 radio*	at udsbr?
 
+# XBOX controller
+xboxcontroller*	at uhub? port ?
+wsmouse*	at xboxcontroller? mux 0
+
 # USB Generic driver
 ugen*	at uhub? port ?
 # On ugen bulk endpoints, perform read-ahead and write-behind.