Make 'make upload' work