you should be able to CVS diff multiple files at once, and make only one patch (easier to keep track of)