Rafael Nadal will play Novak Djokovic in a blockbuster second-round Olympic clash at Roland Garros after battling past Marton Fucsovics.
The two most successful male players of all time have played each other 59 times before, with Djokovic leading by one, but not since a quarter-final won by the Spaniard at the French Open two years ago.
Now they will meet on the same stage and for a second time at the Olympics, 16 years after Nadal edged a close contest in the semi-finals in Beijing.
There was a collective intake of breath when the draw placed the two old stagers so close together, and Djokovic needed less than an hour to see off alternate Matt Ebden on Saturday.
Rafael Nadal will play Novak Djokovic in a blockbuster second-round Olympic clash
Nadal had been weighing up whether to play the match at all after concerns over a right thigh problem and a late finish to his doubles opener with Carlos Alcaraz on Saturday night.
But the draw of an 11th duel with Djokovic on the Parisian clay proved strong and Nadal, who missed Wimbledon to prepare for this event, gritted his way to a 6-1 4-6 6-4 victory against Hungarian Fucsovics.
Djokovic described the possibility of the match-up as 'one last dance' after the draw and, speaking on Saturday, he said of the 14-time French Open champion: 'Playing him is like finals for me.
Nadal and Djokovic they will meet on the same stage and for a second time at the Olympics
'In any tournament and particularly here, knowing what he has achieved and what he's done for our sport, particularly here in Roland Garros, his record speaks for itself.
'So I look forward to it. If we get to face each other, it's going to be, possibly, the last time we face each other on a big stage, so I'm sure that people would enjoy it.'