diff --git a/ChangeLog b/ChangeLog
index 95660481bf..f5b9aeb650 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 16 17:41:22 CEST 2007 Daniel Veillard <veillard@redhat.com>
+
+	* src/xend_internal.c: patch from Masayuki Sunou to avoid
+	  attach-disk/attach-interface when < Xen 3.0.4
+
 Thu Aug 16 15:24:30 CEST 2007 Daniel Veillard <veillard@redhat.com>
 
 	* src/virsh.c: vshCommandOptInt was broken as it would not
diff --git a/src/xend_internal.c b/src/xend_internal.c
index 020e29c048..b77afa8d1a 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -3091,6 +3091,13 @@ xenDaemonAttachDevice(virDomainPtr domain, char *xml)
 
     priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
 
+    /*
+     * on older Xen without the inactive guests management
+     * avoid doing this on inactive guests
+     */
+    if ((domain->id < 0) && (priv->xendConfigVersion < 3))
+        return (-1);
+
     str = virDomainGetOSType(domain);
     if (strcmp(str, "linux"))
         hvm = 1;