Updated the CVS build stuff