Making the default repository setup more sane.