diff --git a/ChangeLog b/ChangeLog
index c24edc6ab4..4edc316c67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Feb 26 18:28:00 UTC 2008 Richard W.M. Jones <rjones@redhat.com>
+
+	No address attribute in Xen domain XML.
+	* src/xm_internal.c: handle the case where <mac/> clause
+	  in Xen domain interface has no address attribute
+	  (Shigeki Sakamoto).
+
 Tue Feb 26 08:02:57 CET 2008 Daniel Veillard <veillard@redhat.com>
 
 	* src/driver.h src/libvirt.c src/openvz_driver.c src/qemu_driver.c
diff --git a/src/xm_internal.c b/src/xm_internal.c
index 711774bd27..b12d99cecf 100644
--- a/src/xm_internal.c
+++ b/src/xm_internal.c
@@ -2769,12 +2769,13 @@ xenXMAttachInterface(virDomainPtr domain, xmlXPathContextPtr ctxt, int hvm,
     }
     source = xmlGetProp(node, BAD_CAST type);
 
-    if (!(node = virXPathNode("/interface/mac", ctxt))) {
+    if ((node = virXPathNode("/interface/mac", ctxt)))
+        mac = xmlGetProp(node, BAD_CAST "address");
+    if (!node || !mac) {
         if (!(mac = (xmlChar *)xenXMAutoAssignMac()))
             goto cleanup;
         autoassign = 1;
-    } else
-        mac = xmlGetProp(node, BAD_CAST "address");
+    }
 
     list_item = virConfGetValue(entry->conf, "vif");
     if (list_item && list_item->type == VIR_CONF_LIST) {