r573: fixing packaging