diff --git a/ChangeLog b/ChangeLog
index b2236a7c4f..a63ef56569 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Apr 19 16:14:22 BST 2009 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/domain_conf.c: Switch over todo domain lookup based
+	on UUID in virDomainAssignDef
+
 Sun Apr 19 16:14:22 BST 2009 Daniel P. Berrange <berrange@redhat.com>
 
 	* docs/libvirt-api.xml, docs/libvirt-refs.xml,
diff --git a/src/domain_conf.c b/src/domain_conf.c
index cfb8bc5e1e..648d9e9622 100644
--- a/src/domain_conf.c
+++ b/src/domain_conf.c
@@ -499,7 +499,7 @@ virDomainObjPtr virDomainAssignDef(virConnectPtr conn,
 {
     virDomainObjPtr domain;
 
-    if ((domain = virDomainFindByName(doms, def->name))) {
+    if ((domain = virDomainFindByUUID(doms, def->uuid))) {
         if (!virDomainIsActive(domain)) {
             virDomainDefFree(domain->def);
             domain->def = def;