Here is a patch that makes it work and fixes a couple of tests that were
failing in the BSD style. Hope it helps.