sync with FreeBSD rev 1.6: