Newer versions of the support scripts upstream