diff --git a/ChangeLog b/ChangeLog
index 2dc391ced6..8436b086aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 13 14:25:16 CEST 2007 Daniel Veillard <veillard@redhat.com>
+
+	* src/xml.c: applied modified patch from Masayuki Sunou for
+	  device hot plug description with a wrong root element.
+
 Fri Jul 13 10:28:53 CEST 2007 Daniel Veillard <veillard@redhat.com>
 
 	* src/virterror.c src/xml.c include/libvirt/virterror.h:
diff --git a/src/xml.c b/src/xml.c
index b6a83ecb49..5337598dcb 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -1351,6 +1351,9 @@ virParseXMLDevice(virConnectPtr conn, char *xmldesc, int hvm, int xendConfigVers
     else if (xmlStrEqual(node->name, BAD_CAST "interface")) {
         if (virDomainParseXMLIfDesc(conn, node, &buf, hvm, xendConfigVersion) != 0)
             goto error;
+    } else {
+        virXMLError(conn, VIR_ERR_XML_ERROR, (const char *) node->name, 0);
+	goto error;
     }
  cleanup:
     if (xml != NULL)