I also recommend that you should look into using a distributed version control system like git. Take a look at git-cvsimport and git-cvsexportcommit for using git with a remote CVS repository. If your organisation wants to change its main repository to git it could then use git-cvsserver for those developers who want to continue using the CVS client for accessing the repository.