r885: more packaging fixes