diff --git a/tools/rosbash/rosbash b/tools/rosbash/rosbash
index c8f20df9..5017ec51 100644
--- a/tools/rosbash/rosbash
+++ b/tools/rosbash/rosbash
@@ -363,7 +363,7 @@ function _roscomplete_rossrv {
     arg="${COMP_WORDS[COMP_CWORD]}"
 
     if [[ $COMP_CWORD == 1 ]]; then
-        opts="show users md5 package packages"
+        opts="show list md5 package packages"
         COMPREPLY=($(compgen -W "$opts" -- ${arg}))
     elif [[ $COMP_CWORD == 2 ]]; then
         case ${COMP_WORDS[1]} in
@@ -375,7 +375,7 @@ function _roscomplete_rossrv {
                 opts=`rospack list-names`
                 COMPREPLY=($(compgen -W "$opts" -- ${arg}))                
                 ;;
-            packages)
+            packages|list)
                 # This shouldn't really have a completion rule
                 ;;
         esac
@@ -722,7 +722,7 @@ function _roscomplete_rosmsg {
     arg="${COMP_WORDS[COMP_CWORD]}"
 
     if [[ $COMP_CWORD == 1 ]]; then
-        opts="show users md5 package packages"
+        opts="show list md5 package packages"
         COMPREPLY=($(compgen -W "$opts" -- ${arg}))
     elif [[ $COMP_CWORD == 2 ]]; then
         case ${COMP_WORDS[1]} in
@@ -734,7 +734,7 @@ function _roscomplete_rosmsg {
                 opts=`rospack list-names`
                 COMPREPLY=($(compgen -W "$opts" -- ${arg}))                
                 ;;
-            packages)
+            packages|list)
                 # This shouldn't really have a completion rule
                 ;;
         esac
diff --git a/tools/rosbash/roszsh b/tools/rosbash/roszsh
index b46b3e4c..20a8c6c5 100644
--- a/tools/rosbash/roszsh
+++ b/tools/rosbash/roszsh
@@ -509,7 +509,7 @@ function _roscomplete_rosmsg {
 
 
     if [[ ${CURRENT} == 2 ]]; then
-        opts="show users md5 package packages"
+        opts="show list md5 package packages"
         reply=(${=opts})
     elif [[ ${CURRENT} == 3 ]]; then
         case ${=${(s: :)words}[2]} in
@@ -521,7 +521,7 @@ function _roscomplete_rosmsg {
                 opts=`rospack list-names`
                 reply=(${=opts})
                 ;;
-            packages)
+            packages|list)
                 # This shouldn't really have a completion rule
                 ;;
         esac
@@ -572,7 +572,7 @@ function _roscomplete_rossrv {
 
 
     if [[ ${CURRENT} == 2 ]]; then
-        opts="show users md5 package packages"
+        opts="show list md5 package packages"
         reply=(${=opts})
     elif [[ ${CURRENT} == 3 ]]; then
         case ${=${(s: :)words}[2]} in
@@ -584,7 +584,7 @@ function _roscomplete_rossrv {
                 opts=`rospack list-names`
                 reply=(${=opts})
                 ;;
-            packages)
+            packages|list)
                 # This shouldn't really have a completion rule
                 ;;
         esac