I've managed- as usual- to screw things up; but, there is a solution.

In the meantime, I'm patching against FreeBSD-CURRENT using the following:
1. http://www.7he.at/freebsd/vps/ The patch is linked on te main page.
#patch -p1 <vps*diff
2. http://people.freebsd.org/~kevlo/ udplite.diff. 
#patch -p<udplite.diff
3. I'm not sure about vimage.
Wait.....
4. http://people.freebsd.org/~mm/patches/ pf_mtag
#patch -p<pf_mtag.patch && patch -p<pf_matg.2.patch