diff --git a/ChangeLog b/ChangeLog
index b60e137c95..2d79dfaacf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar  7 10:22:00 CET 2008 Daniel Veillard <veillard@redhat.com>
+
+	* src/xend_internal.c: applied patch from Cole Robinson to not
+	  loose the boot tag when defining a fully virtualized xen domain
+
 Tue Mar  4 20:01:00 UTC 2008 Richard W.M. Jones <rjones@redhat.com>
 
 	Make iSCSI login actually work
diff --git a/src/xend_internal.c b/src/xend_internal.c
index 8bbc28f07c..fef54f8717 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -1323,7 +1323,7 @@ xend_parse_sexp_desc_os(virConnectPtr xend, struct sexpr *node, virBufferPtr buf
     if (hvm)
         virBufferVSprintf(buf, "    <loader>%s</loader>\n", loader);
 
-    if (kernel) {
+    if ((kernel) && ((!loader) || (STRNEQ(kernel, loader)))) {
         virBufferVSprintf(buf, "    <kernel>%s</kernel>\n", kernel);
         if (initrd && initrd[0])
             virBufferVSprintf(buf, "    <initrd>%s</initrd>\n", initrd);