Roger Federer has announced that he is planning to take part in the 2016 Olympic Games in Rio de Janeiro.

During a press conference ahead of the BNP Paribas Open in New York next month, the Swiss was reminded that he had previously earmarked the London Olympics as a possible retirement date.

However, the world number three has said that was never really his plan and believes that his body will tell him when to stop playing tennis.

"Yes, I did say three years ago, four even, that I will definitely play until the London Olympics," said the 30-year-old.

"It was more getting journalists off my back, to be quite honest. I will be playing at the London Olympics but, hell, I won't be retiring at the London Olympics.

"My body will tell me when to stop, but I haven't set the date in any shape or form or thought about it in any way. At this point, I'm hoping to play in Rio."

Federer was crowned Rotterdam 500 champion for the second time in his career last week.