Fix panopoly magic in make. Update patch.