diff --git a/ChangeLog b/ChangeLog
index fa964a9948..1e099d1ceb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-Wed Jun 11 17:21:13 CEST 2008 Daniel P. Berrange <berrange@redhat.com>
+Thu Jun 12 10:53:08 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+	* src/qemu_driver.c: patch from Kaitlin Rupert, changing vcpu or
+	  memory of an active domain is a NO_SUPPORT not INTERNAL_ERROR
+
+Wed Jun 11 17:21:13 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
 	* po/*: update and regenerated
 
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 97c6483903..adb4d5892d 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -2148,7 +2148,7 @@ static int qemudDomainSetMemory(virDomainPtr dom, unsigned long newmem) {
     }
 
     if (qemudIsActiveVM(vm)) {
-        qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
+        qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT,
                          "%s", _("cannot set memory of an active domain"));
         return -1;
     }
@@ -2404,7 +2404,7 @@ static int qemudDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) {
     }
 
     if (qemudIsActiveVM(vm)) {
-        qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
+        qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT, "%s",
                          _("cannot change vcpu count of an active domain"));
         return -1;
     }