Sync with NetBSD: