Also update reflecting the current version. More cleanup is needed before pulling it up to netbsd-1-5.