r9094: freebsd changes