r15166: finial packaging changes (hopefully)