Patch against CVS HEAD