ipfw2 broken

How do I get the ipfw2 module to compile with divert?  It doesn't
recognize the following in my config file when building the module:

options         IPFIREWALL_FORWARD
options         IPDIVERT

Also, the /etc/rc.d/ipfw script is looking for an invalid sysctl var:

net.inet.ip.fw.enable

and it will fail if I have the IPFIREWALL option which compiles the code
into the kernel because it will try to load and return 1 on a failure.

This is an amd64 system.

Cheers,
Sean