diff --git a/lib/ChangeLog b/lib/ChangeLog
index d14c61d..b14f183 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -3,6 +3,8 @@
 	* command.c: Undo commit of sign warning fix and hidden command
 	  in list_cmd. Sign warning is more subtle. list_cmd on its own
 	  will be committed after.
+	* command.c: (config_list_cmd) Don't list hidden or deprecated
+	  commands, hiding these from tab completion is still to be done.
 
 2005-03-08 Paul Jakma <paul.jakma@sun.com>
 
diff --git a/lib/command.c b/lib/command.c
index 627be32..abd7106 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -1,5 +1,5 @@
 /*
-   $Id: command.c,v 1.42 2005/03/09 13:39:26 paul Exp $
+   $Id: command.c,v 1.43 2005/03/09 13:42:23 paul Exp $
  
    Command interpreter routine for virtual terminal [aka TeletYpe]
    Copyright (C) 1997, 98, 99 Kunihiro Ishiguro
@@ -2483,7 +2483,9 @@
   struct cmd_element *cmd;
 
   for (i = 0; i < vector_max (cnode->cmd_vector); i++)
-    if ((cmd = vector_slot (cnode->cmd_vector, i)) != NULL)
+    if ((cmd = vector_slot (cnode->cmd_vector, i)) != NULL
+        && !(cmd->attr == CMD_ATTR_DEPRECATED
+             || cmd->attr == CMD_ATTR_HIDDEN))
       vty_out (vty, "  %s%s", cmd->string,
 	       VTY_NEWLINE);
   return CMD_SUCCESS;