Package upgrade

I hope this is right.