811ce88
Bring in code from upstream revamp branch Also, run autoreconf, because the changes vs. tarball became impractically large to patch.