diff --git a/AUTHORS b/AUTHORS
index e6f1a9ecdc..25fc26ffcc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -72,6 +72,8 @@ Patches have also been contributed by:
   Laine Stump          <laine@redhat.com>
   Abel Míguez Rodríguez<amiguezr@pdi.ucm.es>
   Doug Goldstein       <cardoe@gentoo.org>
+  Javier Fontan        <jfontan@gmail.com>
+  Federico Simoncelli  <federico.simoncelli@gmail.com>
 
   [....send patches to get your name here....]
 
diff --git a/ChangeLog b/ChangeLog
index fd50683fe3..2a5f21070f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jun 25 15:46:11 CEST 2009 Daniel Veillard <veillard@redhat.com>
+
+	* src/qemu_driver.c: fix a domain state problem after
+	  migration, patch  by Federico Simoncelli, fixes #507537
+	* src/domain_conf.c:  fix a transcient domain state problem after
+	  destroy, patch  by Federico Simoncelli, fixes #507304
+	* AUTHORS: add Federico Simoncelli and Javier Fontan
+
 Thu Jun 25 10:32:22 BST 2009 Daniel P. Berrange <berrange@redhat.com>
 
 	Fix broken dominfo command when no security driver is implemented
diff --git a/src/domain_conf.c b/src/domain_conf.c
index e7523f586c..ffa2aef3fb 100644
--- a/src/domain_conf.c
+++ b/src/domain_conf.c
@@ -4187,7 +4187,8 @@ int virDomainLoadAllConfigs(virConnectPtr conn,
                                       opaque);
         if (dom) {
             virDomainObjUnlock(dom);
-            dom->persistent = 1;
+            if (!liveStatus)
+                dom->persistent = 1;
         }
     }
 
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 89c252d017..14d00cc95a 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -5116,6 +5116,7 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn,
         event = virDomainEventNewFromObj(vm,
                                          VIR_DOMAIN_EVENT_RESUMED,
                                          VIR_DOMAIN_EVENT_RESUMED_MIGRATED);
+        virDomainSaveStatus(dconn, driver->stateDir, vm);
     } else {
         qemudShutdownVMDaemon (dconn, driver, vm);
         event = virDomainEventNewFromObj(vm,