Sort:  

I always use lens correction and the transformation tool on Lightroom. Works fine most of the time.