My changes to FreeBSD, hopefully will be merged back into upstream.