21.2: success with latest CVS (+ patch)