improve CVS build, still broken