diff --git a/ChangeLog b/ChangeLog
index b871aeee3c..544fcebe23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 27 10:40:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
+
+	Display autostart status in virsh dominfo command.
+	* src/virsh.c: Display autostart status in virsh dominfo
+	command (Shigeki Sakamoto).
+
 Tue May 27 09:54:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
 
 	Fix use of header files in disk storage backend.
diff --git a/src/virsh.c b/src/virsh.c
index 4dd4c5e8b1..c6698e2cf2 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -1492,7 +1492,7 @@ cmdDominfo(vshControl * ctl, vshCmd * cmd)
 {
     virDomainInfo info;
     virDomainPtr dom;
-    int ret = TRUE;
+    int ret = TRUE, autostart;
     unsigned int id;
     char *str, uuid[VIR_UUID_STRING_BUFLEN];
 
@@ -1545,6 +1545,11 @@ cmdDominfo(vshControl * ctl, vshCmd * cmd)
         ret = FALSE;
     }
 
+    if (!virDomainGetAutostart(dom, &autostart)) {
+        vshPrint(ctl, "%-15s %-15s\n", _("Autostart:"),
+                 autostart ? _("enable") : _("disable") );
+    }
+
     virDomainFree(dom);
     return ret;
 }