Yes, you should change the timing belt and water pump at the same time. I think you are supposed to chage the timing belt and water pump by 90K, but mine had to be changed at about 60k.