diff --git a/ChangeLog b/ChangeLog
index 94c8d8cc7a..e300a138e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar 22 13:34:32 EST 2006 Daniel Veillard <veillard@redhat.com>
+
+	* python/tests/create.py: adapt to new naming scheme in FC5
+
 Tue Mar 21 00:40:29 CET 2006 Daniel Veillard <veillard@redhat.com>
 
 	* src/driver.h src/xen_internal.c: just add a driver block for
diff --git a/python/tests/create.py b/python/tests/create.py
index d2823c8c4c..da438c9f09 100755
--- a/python/tests/create.py
+++ b/python/tests/create.py
@@ -29,8 +29,13 @@ if osroot == None:
 
 kernel=open("/proc/version").read().split()
 kernelOv = kernel[2]
-kernelU = "/boot/vmlinuz-" + kernelOv.replace('hypervisor', 'guest')
-initrdU = "/boot/initrd-" + kernelOv.replace('hypervisor', 'guest') + ".img"
+
+if kernelOv.find('hypervisor'):
+    kernelU = "/boot/vmlinuz-" + kernelOv.replace('hypervisor', 'guest')
+    initrdU = "/boot/initrd-" + kernelOv.replace('hypervisor', 'guest') + ".img"
+elif kernelOv.find('xen0'):
+    kernelU = "/boot/vmlinuz-" + kernelOv.replace('xen0', 'xenU')
+    initrdU = "/boot/initrd-" + kernelOv.replace('xen0', 'xenU') + ".img"
 
 if not os.access(kernelU, os.R_OK):
     print "Did not found the guest kernel %s" % (kernelU)