Aussie giant-killer John Millman is on track for a rematch with Roger Federer at the Swiss Indoors in Basel.
Millman shocked the world at the US Open last month with a stunning four-set win over the 20-time major winner in the fourth round.
Now, it seems Millman won't have to wait long for another shot at Federer, this time at the home tournament for the Swiss maestro and the event where he was once a ball boy.
The pair are on a collision course to meet in the second round of the ATP 500 event.
MORE: Wimbledon to introduce final-set tie-breaks
Millman faces Germany's Jan Lennard-Struff in the first round, while Federer comes up against Serbia's Filip Krajinovic.
The 29-year old has been riding high since his unexpected run at New York, which was eventually ended by Novak Djokovic in the quarter-finals.
He currently has a career-high ranking of 33 in the world, putting him in the frame for a seeding at the Australian Open in January.
Federer and Millman are at one win apiece in the career head-to-head record, with the world No.3 defeating the Queenslander in three sets at the Brisbane International in 2015 before last month's Flushing Meadows boilover.
It's Millman's first appearance at the Swiss Indoors event. By contrast, Federer has won the tournament eight times, and featured in 11 of the last 12 finals at Basel.
Millman's compatriot Matt Ebden could face German world No.5 Alexander Zverev in the second round.