diff --git a/ChangeLog b/ChangeLog
index d4fbf64c21..860bc93f06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 24 09:08:32 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+	* src/qemu_driver.c: patch from Guido Günther checking for
+	  unsupported migrate command
+
 Tue Jul 22 19:48:51 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
 	* docs/java.html docs/java.html.in: added documentation for the
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 3d0b6c5114..01b4d18eb8 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -2417,6 +2417,19 @@ static int qemudDomainSave(virDomainPtr dom,
         return -1;
     }
 
+    DEBUG ("migrate reply: %s", info);
+
+    /* If the command isn't supported then qemu prints:
+     * unknown command: migrate" */
+    if (strstr(info, "unknown command:")) {
+        qemudReportError (dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT,
+                          "%s",
+                          _("'migrate' not supported by this qemu"));
+        VIR_FREE(info);
+        VIR_FREE(command);
+        return -1;
+    }
+
     VIR_FREE(info);
     VIR_FREE(command);