diff --git a/ChangeLog b/ChangeLog
index 779d60371a56c58dab87e48f8f4d39facc39bc96..78c8773106592f8e997e82fbcd766c1e5186ae3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Mar  4 19:57:00 UTC 2008 Richard W.M. Jones <rjones@redhat.com>
+
+	Report error when vcpupin is given bad vCPU number.
+	* src/virsh.c: Report error when vcpupin is given bad vCPU number
+	  (Shigeki Sakamoto).
+
 Mon Mar  3 21:39:17 CET 2008 Jim Meyering <meyering@redhat.com>
 
 	Also ignore leading zeros when comparing MAC addresses.
diff --git a/src/virsh.c b/src/virsh.c
index caeea458e82e119549d1b925608ce0917d76f2dc..c6bac127b72227d59c87b89c2f7047d11d501e24 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -1723,6 +1723,7 @@ cmdVcpupin(vshControl * ctl, vshCmd * cmd)
 
     vcpu = vshCommandOptInt(cmd, "vcpu", &vcpufound);
     if (!vcpufound) {
+        vshError(ctl, FALSE, _("vcpupin: Invalid or missing vCPU number."));
         virDomainFree(dom);
         return FALSE;
     }