Moar prep work for package control, #2