Roger Federer has signed a three-year contract to play at the Swiss Indoors in Basel, meaning that the 35-year-old will not be hanging up his racket for at least three more years.

The 18-time Grand Slam Champion had hinted that his career may be close to an end as he addressed his adoring fans following January’s Australian Open triumph.

“I hope to see you next year,” said Federer after beating Nadal to claim his latest Major title. “If not, this was a wonderful run here and I can’t be more happy to have won tonight.”

But supporters of the Swiss star can rest easy with Monday’s news that Federer will feature in at least one tournament for the next three years.

"I cannot wait to return to my home-country in the autumn,” Federer said in a statement released by the Swiss tennis federation. “Playing in Basel is always a highlight of the year."

The Swiss star took an extended break last year to deal with fitness issues, which he said himself could help extend his career by at least "a couple more years".