I’m not a big fan of converging verticals. One of the first things that I habitually do with my architectural works is correct for these, my favourite tool of choice being DXO Viewpoint. In my opinion, this program is pretty much a must-have for anyone interested in photographing architectural views. I also use their PhotoLab and previously Optics Pro software for some basic corrections but Viewpoint is a great product for more advanced correction and integrates with both Optics Pro and PhotoLab.
A small tip, when framing the scene do not frame the subject too tightly, leave a fair amount of “wiggle” room around edges 🙂 as it’ll be needed when applying correction. Else you will end up with parts of the building cut off. This is the exception to my general habit of composing a scene 100% in the viewfinder and not cropping during processing. As an exception to the above I’ll not be using this process if I ever get to photograph the leaning tower of Pizza. 🙂