diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index b6a2eea..ad7e7b2 100644
--- a/vtysh/ChangeLog
+++ b/vtysh/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-28 Hasso Tepper <hasso at quagga.net>
+
+	* vtysh.c: "show running-daemons" broke users habits who are using
+	  "sho run" to view running configuration. Changed it to "show
+	  daemons". 
+
 2004-10-20 Hasso Tepper <hasso at quagga.net>
 
 	* vtysh.c: Don't popen pager if command is "exit". Fixes "vtysh screws
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index cea91b3..d3f672d 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -1676,9 +1676,9 @@
   return CMD_SUCCESS;
 }
 
-DEFUN (vtysh_show_running_daemons,
-       vtysh_show_running_daemons_cmd,
-       "show running-daemons",
+DEFUN (vtysh_show_daemons,
+       vtysh_show_daemons_cmd,
+       "show daemons",
        SHOW_STR
        "Show list of running daemons\n")
 {
@@ -2160,8 +2160,8 @@
   install_element (ENABLE_NODE, &vtysh_terminal_length_cmd);
   install_element (VIEW_NODE, &vtysh_terminal_no_length_cmd);
   install_element (ENABLE_NODE, &vtysh_terminal_no_length_cmd);
-  install_element (VIEW_NODE, &vtysh_show_running_daemons_cmd);
-  install_element (ENABLE_NODE, &vtysh_show_running_daemons_cmd);
+  install_element (VIEW_NODE, &vtysh_show_daemons_cmd);
+  install_element (ENABLE_NODE, &vtysh_show_daemons_cmd);
 
   install_element (VIEW_NODE, &vtysh_ping_cmd);
   install_element (VIEW_NODE, &vtysh_ping_ip_cmd);