Roger Federer has confirmed he will grace the clay courts at the French Open and Geneva Open.

The 20-time grand slam champion made his comeback at the Qatar Open last month after a long absence following knee surgery.

Federer was beaten by Nikoloz Basilashvili at the quarter-final stage in Doha before opting against playing in Dubai and Miami.

The 39-year-old Swiss on Sunday announced he will feature on home soil in a Geneva Open event that gets under way on May 16.

World number seven Federer will also be in the draw for the second grand slam of the year at Roland Garros, where he reached the semi-final two years ago in his first appearance at the Paris major since 2015.

He tweeted: "Hi everyone! Happy to let you know that I will play Geneva and Paris.

"Until then, I will use the time to train. Can't wait to play in Switzerland again."

Rafael Nadal will be a strong favourite to surpass Federer's tally of grand slam titles in Paris, where he has won the French Open a record 13 times.