diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index 11192c1..e4908b4 100644
--- a/vtysh/ChangeLog
+++ b/vtysh/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-17 Paul Jakma <paul.jakma@sun.com>
+
+	* vtysh.c: (general) Add 'show logging' command.
+
 2006-01-11 Erik Smit <zoiah@zoiah.net>
 
 	* vtysh.c: (vtysh_config_from_file) fix regression from
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 08ed749..a2115fa 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -1312,6 +1312,26 @@
        "Exit current mode and down to previous mode\n")
 
 /* Logging commands. */
+DEFUN (vtysh_show_logging,
+       vtysh_show_logging_cmd,
+       "show logging",
+       SHOW_STR
+       "Show current logging configuration\n")
+{
+  unsigned int i;
+  int ret = CMD_SUCCESS;
+  char line[] = "show logging\n";
+  
+  for (i = 0; i < VTYSH_INDEX_MAX; i++)
+    {
+      fprintf (stdout,"Logging configuration for %s:\n", vtysh_client[i].name);
+      ret = vtysh_client_execute (&vtysh_client[i], line, stdout);
+      fprintf (stdout,"\n");
+    }
+        
+  return ret;
+}
+
 DEFUNSH (VTYSH_ALL,
 	 vtysh_log_stdout,
 	 vtysh_log_stdout_cmd,
@@ -2326,7 +2346,10 @@
   install_element (ENABLE_NODE, &vtysh_start_shell_cmd);
   install_element (ENABLE_NODE, &vtysh_start_bash_cmd);
   install_element (ENABLE_NODE, &vtysh_start_zsh_cmd);
-
+  
+  /* Logging */
+  install_element (ENABLE_NODE, &vtysh_show_logging_cmd);
+  install_element (VIEW_NODE, &vtysh_show_logging_cmd);
   install_element (CONFIG_NODE, &vtysh_log_stdout_cmd);
   install_element (CONFIG_NODE, &vtysh_log_stdout_level_cmd);
   install_element (CONFIG_NODE, &no_vtysh_log_stdout_cmd);