--- xen-1.2.orig/xenolinux-2.4.25-sparse/arch/xeno/Makefile
+++ xen-1.2/xenolinux-2.4.25-sparse/arch/xeno/Makefile
@@ -16,6 +16,8 @@
 #           Added '-march' and '-mpreferred-stack-boundary' support
 #
 
+override EXTRAVERSION := -xeno$(EXTRAVERSION)
+
 LD=$(CROSS_COMPILE)ld -m elf_i386
 OBJCOPY=$(CROSS_COMPILE)objcopy -O binary -R .note -R .comment -S
 LDFLAGS=-e stext
--- xen-1.2.orig/xenolinux-2.4.25-sparse/Makefile
+++ xen-1.2/xenolinux-2.4.25-sparse/Makefile
@@ -1,15 +1,18 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 25
-EXTRAVERSION = -xeno
+EXTRAVERSION =
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
-ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
+# SUBARCH tells the xeno build what the underlying arch is.  That is set
+# first, and if a xeno build is happening, the "ARCH=xeno" on the command
+# line overrides the setting of ARCH below.  If a native build is happening,
+# then ARCH is assigned, getting whatever value it gets normally, and
+# SUBARCH is subsequently ignored.
 
-# Xeno hack XXX
-ARCH    := xeno
-SUBARCH := i386
+SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
+ARCH := $(SUBARCH)
 
 KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g")
 
@@ -87,7 +90,7 @@
 # makefile but the arguement can be passed to make if needed.
 #
 
-MODLIB	:= $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
+MODLIB	= $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
 export MODLIB
 
 #