"Geoff deserved a new contract and this will take him up to the age of 33," manager Bryan Robson told the clubs official website.
"The way he has gone about his job since I've been here has been very good.
"He works hard, looks very sharp and he has scored some very important goals for us.
"This is reward for that and I'm delighted he's signed for another two years."