minimize diffs from version in NetBSD distrib