More work on BSD patch.