I changed the water pump on my wifes car a few months back. I cannot remember how many bolts there were. I did have to dismount the power steering pump and push it to the side to get access to the far left bolt. While you are at it, change the plastic elbows that connect the idler bracket to the block and LIM. They are on a help card at Advance for like 4 bucks. It will make it easier to do that at the same time because without the idler/alternator bracket in the way you have full access to the water pump.
J