Cope with new location of upstream files