Aye, though I checked the rev number and they apparently forked from before I added -o support, so I'm in the clear.

We (FreeBSD) should really reconcile our diff against OpenBSD and figure out what of the work I've done downstream makes sense and what doesn't. I'd imagine there's a healthy amount in both categories.

That's the line I'm referring to indeed