diff --git a/ChangeLog b/ChangeLog
index 7544099dd2..1b3f49fe17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jun  7 15:48:30 CEST 2007 Daniel Veillard <veillard@redhat.com>
+
+	* src/xm_internal.c: Fix boot device XML -> config conversion
+	* test/xmconfigdata/test-fullvirt-new-cdrom.xml,
+	test/xmconfigdata/test-fullvirt-old-cdrom.xml fix syntax for
+	boot device
+
 Thu Jun  7 15:48:30 CEST 2007 Daniel Veillard <veillard@redhat.com>
 
 	* src/xend_internal.c src/xm_internal.c src/xml.c: add support
diff --git a/src/xm_internal.c b/src/xm_internal.c
index 495a957bc7..8bd7db71af 100644
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -1800,7 +1800,7 @@ virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml) {
                                           "cannot set the os loader parameter") < 0)
             goto error;
 
-        obj = xmlXPathEval(BAD_CAST "string(/domain/os/boot)", ctxt);
+        obj = xmlXPathEval(BAD_CAST "string(/domain/os/boot/@dev)", ctxt);
         if ((obj != NULL) && (obj->type == XPATH_STRING) &&
             (obj->stringval != NULL)) {
             if (!strcmp((const char*)obj->stringval, "fd"))
diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
index 1d4313a5bb..84e671a71b 100644
--- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
+++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml
@@ -4,7 +4,7 @@
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot>cdrom</boot>
+    <boot dev='cdrom'/>
   </os>
   <currentMemory>403456</currentMemory>
   <memory>592896</memory>
diff --git a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml b/tests/xmconfigdata/test-fullvirt-old-cdrom.xml
index 1d4313a5bb..84e671a71b 100644
--- a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml
+++ b/tests/xmconfigdata/test-fullvirt-old-cdrom.xml
@@ -4,7 +4,7 @@
   <os>
     <type>hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
-    <boot>cdrom</boot>
+    <boot dev='cdrom'/>
   </os>
   <currentMemory>403456</currentMemory>
   <memory>592896</memory>