diff --git a/ChangeLog b/ChangeLog
index 860bc93f06..4120cd68ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 24 09:26:51 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+	* src/qemu_driver.c: another patch from Guido Günther checking
+	  for an already running domain on create
+
 Thu Jul 24 09:08:32 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
 	* src/qemu_driver.c: patch from Guido Günther checking for
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 01b4d18eb8..f706819547 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -2006,6 +2006,15 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml,
     if (!(def = virDomainDefParseString(conn, driver->caps, xml)))
         return NULL;
 
+    vm = virDomainFindByName(driver->domains, def->name);
+    if (vm && virDomainIsActive(vm)) {
+        qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                         _("domain %s is already defined and running"),
+                         def->name);
+        virDomainDefFree(def);
+        return NULL;
+    }
+
     if (!(vm = virDomainAssignDef(conn,
                                   &driver->domains,
                                   def))) {