Patches from Piotr Sikora < piotr.sikora@frickle.com > for OpenBSD.