Ferrari have announced that they have extended Felipe Massa's contract until the end of the 2010 season.
There had been rumours that Massa would have to leave the team to make way for Fernando Alonso if the Spaniard split with McLaren after this year, but Ferrari boss Jean Todt dismissed this speculation last month and insisted that the team were committed to Massa and Kimi Raikkonen.
Massa's new deal is also set to end continued suggestions that Alonso could join Ferrari for 2009, when the Brazilian's previous contract would have expired.
Raikkonen's Ferrari deal runs to the end of the 2009 season.
Massa has been contracted to Ferrari since 2001, but was initially placed with the Sauber team.
He was promoted to the Ferrari squad alongside Michael Schumacher last season, and has now taken five victories and eight pole positions for the team.