New world number one Andy Murray will face Stan Wawrinka, Kei Nishikori and Marin Cilic at the round-robin stage of the ATP World Tour Finals this month.
Murray celebrated rising to the top of the rankings for the first time in his career by winning the Paris Masters with a victory over John Isner on Sunday and is the top seed for the season-ending tournament in London, which starts on Sunday.
The three-time major champion heads into the lucrative event on the back of claiming four consecutive titles - taking his tally for the year to eight - and the top seed will come up against the man who dumped him out of the Finals 12 months ago.
Third seed Wawrinka consigned the Brit, who has never won the showpiece at the O2 Arena, to a straight-sets defeat to seal his place in the semi-finals and the US Open champion will take him on again in Group McEnroe.
Nishikori, seeded five, and Cilic have been drawn in the same group, while defending champion Novak Djokovic will aim to put the disappointment of seeing his long reign as world number one end by responding emphatically in Group Lendl as he attempts to take the title for a fifth consecutive year.
The second seed from Serbia has been drawn with Milos Raonic, Gael Monfils and Dominic Thiem.
Raonic was unable to face Murray at the semi-final stage in the French capital on Saturday due to a leg injury, which confirmed the Wimbledon champion would leapfrop Djokovic in the rankings, and the Canadian said he would wait and see whether he will be fit for London.
Monfils and Thiem will compete in the tournament for the first time.