r2930: packaging updates