Zabbix 2.2 and 2.0 fails to compile on OpenBSD 5.4

After upgrading hosts to OpenBSD 5.4, I'm no longer able to compile and install an agent. I've tried the very latest RC and still have this issue.

joe@openbsd:~/zabbix-2.2.1rc1 $ make install
Making install in src
Making install in libs
Making install in zbxcrypto
Making install in zbxcommon
Making install in zbxlog
Making install in zbxalgo
Making install in zbxnix
Making install in zbxconf
Making install in zbxsysinfo
Making install in agent
Making install in common
Making install in simple
Making install in openbsd
gcc -DHAVE_CONFIG_H -I. -I../../../../include -I../../../../src/zabbix_agent/ -g -O2 -I/usr/local/include -MT libspecsysinfo_a-swap.o -MD -MP -MF .deps/libspecsysinfo_a-swap.Tpo -c -o libspecsysinfo_a-swap.o `test -f 'swap.c' || echo './'`swap.c
swap.c: In function 'get_swap_io':
swap.c:167: error: 'struct uvmexp' has no member named 'swapins'
swap.c:171: error: 'struct uvmexp' has no member named 'swapouts'

• • • Error 1 in src/libs/zbxsysinfo/openbsd (Makefile:503 'libspecsysinfo_a-swap.o')
    • Error 1 in src/libs/zbxsysinfo (Makefile:559 'install-recursive')
    • Error 1 in src/libs (Makefile:391 'install-recursive')
    • Error 1 in src (Makefile:367 'install-recursive')
    • Error 1 in /home/joe/zabbix-2.2.1rc1 (Makefile:380 'install-recursive')
      joe@openbsd:~/zabbix-2.2.1rc1 $