Patch against CVS version