diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 3764188292..931eb91593 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -2932,10 +2932,15 @@ DEFUN (vtysh_show_history,
 /* Memory */
 DEFUN (vtysh_show_memory,
        vtysh_show_memory_cmd,
-       "show memory",
+       "show memory [" DAEMONS_LIST "]",
        SHOW_STR
-       "Memory statistics\n")
+       "Memory statistics\n"
+       DAEMONS_STR)
 {
+	if (argc == 3)
+		return show_one_daemon(vty, argv, argc - 1,
+				       argv[argc - 1]->text);
+
 	return show_per_daemon(vty, argv, argc, "Memory statistics for %s:\n");
 }