Thanks for the replies but I think some of you may be missing the point here...
I had the cambelt and tensioner changed under warranty last year. I am now due the 40k service, I was just wondering if I need to replace the waterpump now or whether it can wait til the next cambelt change?
If I was having my cambelt changed now then yes, of course I'd change the water pump too.