MotoGP legend Valentino Rossi is set to finish his career with Yamaha after signing a two-year contract extension.
The deal ties the Italian to the team, where he has won four of his six world titles, until the end of 2016.
"This was my target," said Rossi. "I am feeling good and I'm motivated to keep giving my best. I'm very happy that I can keep riding my YZR-M1."
The 35-year-old is joint second in this season's standings, with five podium finishes in eight races.
Rossi returned to Yamaha in 2013 after a barren two-year spell at Ducati, having previously ridden for the Japanese manufacturer between 2004 and 2010.
"It is our intention that Valentino will remain with Yamaha until the end of his sporting career and beyond," said Yamaha Motor Racing managing director Lin Jarvis.