Use patched maintainer tools