Updated to newest upstream version that has my patch already applied.
Merge branch 'master' of github.com:jasperla/openbsd-wip