The version in CVS has this functionality already.