diff --git a/tools/rosbash/roszsh b/tools/rosbash/roszsh
index 9a6c7d05..6a2928eb 100644
--- a/tools/rosbash/roszsh
+++ b/tools/rosbash/roszsh
@@ -509,6 +509,6 @@ compctl -K "_roscomplete_rosnode" "rosnode"
 compctl -K "_roscomplete_rosparam" "rosparam"
 compctl -K "_roscomplete_rostopic" "rostopic"
 compctl -K "_roscomplete_rosservice" "rosservice"
-compctl -K "_roscomplete_rosmsg" "rosmsg"
-compctl -K "_roscomplete_rossrv" "rossrv"
+compctl -x 'p[1]' -k "(md5 package packages show users)" - 'p[2]' -S '' -K "_roscomplete_rosmsg" -- "rosmsg"
+compctl -x 'p[1]' -k "(md5 package packages show users)" - 'p[2]' -S '' -K "_roscomplete_rossrv" -- "rossrv"
 compctl -K "_roscomplete_roscreate_pkg" "roscreate-pkg"