Roger Federer has signed to play at the Swiss Indoors tournament until 2019, scotching suggestions he could soon retire.
The 35-year-old Australian Open champion is now contracted to appear at the ATP World Tour event, held every October, until 2019. He will be 38 by the time the deal concludes.
Federer, who has won his home tournament seven times, said on the official Swiss Tennis website: "I cannot wait to return to my home country in the autumn. Playing in Basel is always a highlight of the year."
This year's tournament will take place from October 23-29.
Federer was the surprise winner of last month's Australian Open in Melbourne and during his acceptance speech said: "I hope to see you next year, but if not, then it was a wonderful year here."
Some took that as a retirement hint.
The 18-time Grand Slam winner is due to play for the first time since his Melbourne triumph in Dubai next week.