> In addition, there's a perspective controlling plug-in for barrel
> distortion called Lens Doc" from:
> http://www.andromeda.com/ but the effect is minimal for what you're
> asking.
>
But LensDoc can also remove perspective distortion. It has the distinct
advantage over the tools built into PhotoShop in that it lets you select two
lines in the image that should be straight and parallel. Much easier than
the hit and (mostly) miss do-it-yourself approach.