diff --git a/ChangeLog b/ChangeLog
index 734a721cf6..fcc2c89f2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 17 13:47:56 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+	* src/virsh.c: patch from Evgeniy Sokolov for the undefine command
+	  which can't take an id
+
 Wed Jul 16 22:36:43 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
 	* src/libvirt.c src/openvz_driver.c: fix the description of the ID 
diff --git a/src/virsh.c b/src/virsh.c
index 4e91bebcac..f1296ec5df 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -978,7 +978,8 @@ cmdUndefine(vshControl * ctl, vshCmd * cmd)
     if (!vshConnectionUsability(ctl, ctl->conn, TRUE))
         return FALSE;
 
-    if (!(dom = vshCommandOptDomain(ctl, cmd, "domain", &name)))
+    if (!(dom = vshCommandOptDomainBy(ctl, cmd, "domain", &name,
+                                      VSH_BYNAME|VSH_BYUUID)))
         return FALSE;
 
     if (virDomainUndefine(dom) == 0) {