I was reading about Hiawatha security features, and seems like a perfect fit for OpenBSD goals. I'd volunteer to talk to Hugo Leisink (the developer) and see if the code could be relicensed if the project has interest in it. IMHO, replacing forked software with actively developed one is a good idea.
http://hiawatha.leisink.org/ Greetings. PS: Didn't find nothing about a switch to Hiawatha in misc@ archives, if there was a discussion about this, sorry.