diff --git a/ChangeLog b/ChangeLog
index 516adc4c87..5493e517f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jan 25 12:00:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
+
+	Clarify virsh documentation.
+	* docs/virsh.pod: Clarify virsh documentation on when you can
+	  set memory and vCPUs.
+
 Fri Jan 25 10:46:32 CET 2008 Daniel Veillard <veillard@redhat.com>
 
 	* src/xen_internal.c: fix an erronous use of VIR_DOMAIN_NONE instead
diff --git a/docs/virsh.pod b/docs/virsh.pod
index 62e05f35fa..8166db73df 100644
--- a/docs/virsh.pod
+++ b/docs/virsh.pod
@@ -290,6 +290,9 @@ Change the current memory allocation in the guest domain. This should take
 effect immediately. The memory limit is specified in
 kilobytes.
 
+For Xen, you can only adjust the memory of a running domain if the
+domain is paravirtualized or running the PV balloon driver.
+
 =item B<setmaxmem> I<domain-id> B<kilobytes>
 
 Change the maximum memory allocation limit in the guest domain. This should
@@ -302,6 +305,9 @@ Change the number of virtual CPUs active in the guest domain. Note that
 I<count> may be limited by host, hypervisor or limit coming from the 
 original description of domain.
 
+For Xen, you can only adjust the virtual CPUs of a running domain if
+the domain is paravirtualized.
+
 =item B<shutdown> I<domain-id>
 
 Gracefully shuts down a domain.  This coordinates with the domain OS