diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index 3ad1c25..ac038e1 100644
--- a/vtysh/ChangeLog
+++ b/vtysh/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-24 Paul Jakma <paul.jakma@sun.com>
+
+	* vtysh.c: (general) Add 'show memory' command.
+
 2006-05-21 Paul Jakma <paul.jakma@sun.com>
 
 	* vtysh.c: (vtysh_show_logging_cmd) Suppress output for daemons
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 2dbb533..110c361 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -1311,6 +1311,29 @@
        "quit",
        "Exit current mode and down to previous mode\n")
 
+/* Memory */
+DEFUN (vtysh_show_memory,
+       vtysh_show_memory_cmd,
+       "show memory",
+       SHOW_STR
+       "Memory statistics\n")
+{
+  unsigned int i;
+  int ret = CMD_SUCCESS;
+  char line[] = "show memory\n";
+  
+  for (i = 0; i < VTYSH_INDEX_MAX; i++)
+    if ( vtysh_client[i].fd >= 0 )
+      {
+        fprintf (stdout, "Memory statistics for %s:\n", 
+                 vtysh_client[i].name);
+        ret = vtysh_client_execute (&vtysh_client[i], line, stdout);
+        fprintf (stdout,"\n");
+      }
+  
+  return ret;
+}
+
 /* Logging commands. */
 DEFUN (vtysh_show_logging,
        vtysh_show_logging_cmd,
@@ -2349,6 +2372,9 @@
   install_element (ENABLE_NODE, &vtysh_start_bash_cmd);
   install_element (ENABLE_NODE, &vtysh_start_zsh_cmd);
   
+  install_element (VIEW_NODE, &vtysh_show_memory_cmd);
+  install_element (ENABLE_NODE, &vtysh_show_memory_cmd);
+
   /* Logging */
   install_element (ENABLE_NODE, &vtysh_show_logging_cmd);
   install_element (VIEW_NODE, &vtysh_show_logging_cmd);