diff --git a/completions/cvs b/completions/cvs
index 0a9d1d39..abc0a75b 100644
--- a/completions/cvs
+++ b/completions/cvs
@@ -186,6 +186,9 @@ _cvs()
 
             if [[ "$cur" = -* ]]; then
                 _cvs_command_options "$1" $mode
+            else
+                get_entries
+                COMPREPLY=( $( compgen -W '${entries[@]}' -- "$cur" ) )
             fi
             ;;
         annotate)
@@ -342,6 +345,9 @@ _cvs()
 
             if [[ "$cur" = -* ]]; then
                 _cvs_command_options "$1" $mode
+            else
+                get_entries
+                COMPREPLY=( $( compgen -W '${entries[@]}' -- "$cur" ) )
             fi
             ;;
         "")