Arjen Robben has ended speculation about his Bayern Munich future by signing a two-year contract extension that will keep him at the club until June 2015, the Champions League finalists announced on Thursday.
"We're delighted to have extended Arjen's contract until 2015," said Bayern chairman Karl-Heinz Rummenigge.
"Arjen's contract has been extended. Arjen is a very important player and a guarantee for the club's brilliant future."
Robben, 28, joined Bayern from Real Madrid in 2009 and the Dutch international winger's contract had been due to expire in June 2013.
He has scored 39 goals in only 61 Bundesliga appearances for Bayern but has often been sidelined by injuries.
"I've always said that I feel very good in Munich and at Bayern," said Robben.
"That's why I wanted to extend my contract. This extension is also the right sporting decision. We're a great team and I'm sure we'll have great success in the years to come."
Robben's future at the club had been cast into doubt after a changing-room altercation between him and French team-mate Franck Ribery at half-time of Bayern's 2-1 victory over Real Madrid in the first leg of their Champions League semi-final.
"The Robben clan aren't happy with the way the club management have handled the affair of the punch," German daily Bild reported on Monday, in reference to the alleged punch thrown at Robben by Ribery.
However, coach Jupp Heynckes insisted on Thursday - before Robben's contract extension had been announced - that there had been no problems between the two players since Ribery apologised for his actions.
"We have big ambitions but we can only achieve them with them (Robben and Ribery) at the top of their game," said Heynckes.
Denied the Bundesliga title by Borussia Dortmund, Bayern face Jurgen Klopp's side in the German Cup final on May 12 before tackling Chelsea in the Champions League final at their own Allianz Arena stadium on May 19.