A better manual build