diff --git a/ChangeLog b/ChangeLog
index df4c662f64..daddaf7d4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 25 10:23:00 UTC 2008 Richard W.M. Jones <rjones@redhat.com>
+
+	* src/virsh.c: Additional error messages for missing
+	  parameters (Shigeki Sakamoto).
+
 Mon Mar 24 11:56:58 CET 2008 Daniel Veillard <veillard@redhat.com>
 
 	* src/qemu_driver.c: remove trailing newlines from error messages
diff --git a/src/virsh.c b/src/virsh.c
index ec9da261d2..c541f88724 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -1729,6 +1729,7 @@ cmdVcpupin(vshControl * ctl, vshCmd * cmd)
     }
 
     if (!(cpulist = vshCommandOptString(cmd, "cpulist", NULL))) {
+        vshError(ctl, FALSE, _("vcpupin: Missing cpulist"));
         virDomainFree(dom);
         return FALSE;
     }
@@ -1739,6 +1740,7 @@ cmdVcpupin(vshControl * ctl, vshCmd * cmd)
     }
 
     if (virDomainGetInfo(dom, &info) != 0) {
+        vshError(ctl, FALSE, _("vcpupin: Invalid vCPU number."));
         virDomainFree(dom);
         return FALSE;
     }
@@ -4473,6 +4475,7 @@ cmdAttachDevice(vshControl * ctl, vshCmd * cmd)
 
     from = vshCommandOptString(cmd, "file", &found);
     if (!found) {
+        vshError(ctl, FALSE, _("attach-device: Missing <file> option"));
         virDomainFree(dom);
         return FALSE;
     }
@@ -4529,6 +4532,7 @@ cmdDetachDevice(vshControl * ctl, vshCmd * cmd)
 
     from = vshCommandOptString(cmd, "file", &found);
     if (!found) {
+        vshError(ctl, FALSE, _("detach-device: Missing <file> option"));
         virDomainFree(dom);
         return FALSE;
     }