Update for NetBSD and xombrero