diff --git a/contrib/cvs b/contrib/cvs
index 3645ad96..6ddaa086 100644
--- a/contrib/cvs
+++ b/contrib/cvs
@@ -351,6 +351,20 @@ _cvs()
             fi
             ;;
         "")
+            case "$prev" in
+                -T)
+                    _filedir -d
+                    return 0
+                    ;;
+                -e|-s)
+                    return 0
+                    ;;
+                -z)
+                    COMPREPLY=( $( compgen -W '1 2 3 4 5 6 7 8 9' -- "$cur" ) )
+                    return 0
+                    ;;
+            esac
+
             COMPREPLY=( $( compgen -W '$( _cvs_commands ) $( _cvs_options ) \
                 --help --help-commands --help-options --version' -- "$cur" ) )
             ;;