Roger Federer has signed a three-year deal to play at his hometown event in Basel until 2019.
Roger Federer's fantastic photo shoot
Federer has a long history at the Swiss Indoors.
A former ball boy at the tournament, he has won seven titles in Basel, winning in 2006, 2007, 2008, 2010, 2011, 2014 and 2015.
"Playing in Basel is always a highlight of the year," he said.
Federer, 35, will be 38 when his commitment with the tournament concludes.
The 18-time Grand Slam champion missed last year’s tournament—which will take place on hard courts from October 23-29—after knee surgery sidelined him for the second half of the season.
Federer, who returned to action in January, won his first Grand Slam title since 2012 and his 18th in total with victory in the Australian Open.
The world No 9 hasn’t played since his two-week run in Melbourne, but he’ll return to action next week at the Dubai Duty Free Tennis Championships.
Roger Federer's fantastic photo shoot
I will place Tendulkar higher than Kohli, says Harbhajan
'Attack, attack, attack!' That's what Manchester City did