Updated for OpenBSD 5.6