adapt to new CVS updates.