Patch against CVS