Need to get a couple patches from the latest upstream version.
Well, they don't apply, we'd have to upgrade wholesale. So screw it.