diff --git a/distrib/i386/instkernel/Makefile b/distrib/i386/instkernel/Makefile
index a175b76f8d2f..2a67781e77ee 100644
--- a/distrib/i386/instkernel/Makefile
+++ b/distrib/i386/instkernel/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2006/06/02 22:11:07 hubertf Exp $
+#	$NetBSD: Makefile,v 1.2 2006/06/08 22:17:07 hubertf Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -15,14 +15,14 @@ ${V}DIR!=	cd ${.CURDIR}/../ramdisks/${F} && ${PRINTOBJDIR}
 ${V}=		${${V}DIR}/${F}.fs
 .endfor
 
-MDSETTARGETS=		INSTALL		${RAMDISK_B}	-	\
-			INSTALL_LAPTOP	${RAMDISK_B}	-	\
-			INSTALL_XENU	${RAMDISK_B}	-	\
-			INSTALL_XEN3_U	${RAMDISK_B}	-	\
-			INSTALL_SMALL	${RAMDISK_S}	-	\
-			INSTALL_TINY	${RAMDISK_T}	-	\
-			INSTALL_PS2	${RAMDISK_S}	-	\
-			INSTALL_TINY	${RESCUE_T}	netbsd-RESCUE_TINY
+MDSETTARGETS=		INSTALL			${RAMDISK_B}	-	\
+			INSTALL_LAPTOP		${RAMDISK_B}	-	\
+			INSTALL_XEN2_DOMU	${RAMDISK_B}	-	\
+			INSTALL_XEN3_DOMU	${RAMDISK_B}	-	\
+			INSTALL_SMALL		${RAMDISK_S}	-	\
+			INSTALL_TINY		${RAMDISK_T}	-	\
+			INSTALL_PS2		${RAMDISK_S}	-	\
+			INSTALL_TINY		${RESCUE_T}	netbsd-RESCUE_TINY
 
 MDSET_RELEASEDIR=	binary/kernel
 
diff --git a/doc/CHANGES b/doc/CHANGES
index 3b3ad87f881b..ef2c47c85d49 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.631 $>
+LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.632 $>
 
 
 [Note: This file does not mention every change made to the NetBSD source tree.
@@ -302,3 +302,10 @@ Changes from NetBSD 3.0 to NetBSD 4.0:
 		NTP API 4 nanokernel implementation. was expected after
 		4.0 but core@ voted for early import to facilitate early
 		testing and port conversion. simonb & [kardel 20060607]
+	Xen: Renamed kernel config files:
+		INSTALL_XEN3_U -> INSTALL_XEN3_DOMU
+		INSTALL_XENU   -> INSTALL_XEN2_DOMU
+		XEN0           -> XEN2_DOM0
+		XEN3_U         -> XEN3_DOMU
+		XENU           -> XEN2_DOMU
+		[hubertf 20060621]
diff --git a/etc/etc.i386/Makefile.inc b/etc/etc.i386/Makefile.inc
index 45bff6b40fe7..b45811adfe4f 100644
--- a/etc/etc.i386/Makefile.inc
+++ b/etc/etc.i386/Makefile.inc
@@ -1,15 +1,15 @@
-#	$NetBSD: Makefile.inc,v 1.43 2006/06/02 22:35:22 hubertf Exp $
+#	$NetBSD: Makefile.inc,v 1.44 2006/06/08 22:17:07 hubertf Exp $
 #
 #	etc.i386/Makefile.inc -- i386-specific etc Makefile targets
 #
 
 KERNEL_SETS=		GENERIC GENERIC_TINY GENERIC_LAPTOP \
 			GENERIC_DIAGNOSTIC GENERIC_PS2TINY GENERIC.MP \
-			GENERIC.MPACPI XEN0 XENU XEN3_U
+			GENERIC.MPACPI XEN2_DOM0 XEN2_DOMU XEN3_DOMU
 
 BUILD_KERNELS=		INSTALL INSTALL_SMALL INSTALL_TINY \
-			INSTALL_LAPTOP INSTALL_PS2 INSTALL_XENU \
-			INSTALL_XEN3_U
+			INSTALL_LAPTOP INSTALL_PS2 INSTALL_XEN2_DOMU \
+			INSTALL_XEN3_DOMU
 
 INSTALLATION_DIRS+=	installation/misc	\
 			installation/cdrom	\
diff --git a/sys/arch/i386/conf/INSTALL_XENU b/sys/arch/i386/conf/INSTALL_XEN2_DOMU
similarity index 98%
rename from sys/arch/i386/conf/INSTALL_XENU
rename to sys/arch/i386/conf/INSTALL_XEN2_DOMU
index 5fa3fcda0fd0..18e68c56caf9 100644
--- a/sys/arch/i386/conf/INSTALL_XENU
+++ b/sys/arch/i386/conf/INSTALL_XEN2_DOMU
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_XENU,v 1.11 2006/02/05 05:01:55 cube Exp $
+# $NetBSD: INSTALL_XEN2_DOMU,v 1.1 2006/06/08 22:17:07 hubertf Exp $
 
 include 	"arch/xen/conf/std.xen"
 
diff --git a/sys/arch/i386/conf/INSTALL_XEN3_U b/sys/arch/i386/conf/INSTALL_XEN3_DOMU
similarity index 98%
rename from sys/arch/i386/conf/INSTALL_XEN3_U
rename to sys/arch/i386/conf/INSTALL_XEN3_DOMU
index 27327b0ae591..b5d09e0bf1ed 100644
--- a/sys/arch/i386/conf/INSTALL_XEN3_U
+++ b/sys/arch/i386/conf/INSTALL_XEN3_DOMU
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_XEN3_U,v 1.1 2006/03/20 22:34:02 bouyer Exp $
+# $NetBSD: INSTALL_XEN3_DOMU,v 1.1 2006/06/08 22:17:07 hubertf Exp $
 
 include 	"arch/xen/conf/std.xen"
 
diff --git a/sys/arch/i386/conf/XEN0 b/sys/arch/i386/conf/XEN2_DOM0
similarity index 99%
rename from sys/arch/i386/conf/XEN0
rename to sys/arch/i386/conf/XEN2_DOM0
index ee680313835f..e9c3ec15891a 100644
--- a/sys/arch/i386/conf/XEN0
+++ b/sys/arch/i386/conf/XEN2_DOM0
@@ -1,4 +1,4 @@
-# $NetBSD: XEN0,v 1.38 2006/06/01 19:39:59 bouyer Exp $
+# $NetBSD: XEN2_DOM0,v 1.1 2006/06/08 22:17:07 hubertf Exp $
 
 include 	"arch/xen/conf/std.xen"
 
diff --git a/sys/arch/i386/conf/XENU b/sys/arch/i386/conf/XEN2_DOMU
similarity index 99%
rename from sys/arch/i386/conf/XENU
rename to sys/arch/i386/conf/XEN2_DOMU
index 2ff220e961a0..bfc096bb4363 100644
--- a/sys/arch/i386/conf/XENU
+++ b/sys/arch/i386/conf/XEN2_DOMU
@@ -1,4 +1,4 @@
-# $NetBSD: XENU,v 1.21 2006/06/01 19:39:59 bouyer Exp $
+# $NetBSD: XEN2_DOMU,v 1.1 2006/06/08 22:17:07 hubertf Exp $
 
 include 	"arch/xen/conf/std.xen"
 
diff --git a/sys/arch/i386/conf/XEN3_U b/sys/arch/i386/conf/XEN3_DOMU
similarity index 99%
rename from sys/arch/i386/conf/XEN3_U
rename to sys/arch/i386/conf/XEN3_DOMU
index ba1bd7785f75..10db355c3dff 100644
--- a/sys/arch/i386/conf/XEN3_U
+++ b/sys/arch/i386/conf/XEN3_DOMU
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_U,v 1.4 2006/06/01 19:39:59 bouyer Exp $
+# $NetBSD: XEN3_DOMU,v 1.1 2006/06/08 22:17:07 hubertf Exp $
 
 include 	"arch/xen/conf/std.xen"