Take last upstream changes into account in the regexes