merge Marcel Bonnet's patches for Free-BSD