Angel di Maria will return to Real Madrid in the UEFA Champions League group stage after Paris Saint-Germain was drawn alongside the 10-time European champion in Group A.
The Argentina international left the Santiago Bernabeu in 2014 for Manchester United, but never faced Madrid while at Old Trafford.
He will get that opportunity in Group A after his new club was pitched against Rafael Benitez's side, with Shakhtar Donetsk and Malmo – PSG talisman Zlatan Ibrahimovic's first club – completing the group.
Manchester United's return to the group phase will see it go head to head with Eredivisie champion PSV.
Louis van Gaal's side was not involved in last season's competition, but rejoined the continental elite on Thursday (AEST) with a comprehensive 4-0 second-leg victory over Club Brugge – completing a 7-1 aggregate triumph in their qualifier.
United's quest to reach the final in Milan saw it drawn in Group B with top seed PSV, the pair joined by CSKA Moscow and Wolfsburg.
Defending champion Barcelona was the first name drawn in Monaco on Friday (AEST), with Luis Enrique's men to face Bayer Leverkusen – a side it beat 10-2 on aggregate in the 2011-2012 Round of 16 – Roma and BATE in Group E as it looks to become the first club to successfully defend the title.
Jose Mourinho will return to the club he won the trophy with in 2004 as Chelsea faces Porto in Group G, while in Group F Bayern Munich will meet Arsenal for the third time in four seasons.
Draw in full:
Group A: Paris Saint-Germain, Real Madrid, Shakhtar Donetsk, Malmo.
Group B: PSV, Manchester United, CSKA Moscow, Wolfsburg.
Group C: Benfica, Atletico Madrid, Galatasaray, Astana.
Group D: Juventus, Manchester City, Sevilla, Borussia Monchengladbach.
Group E: Barcelona, Bayer Leverkusen, Roma, BATE.
Group F: Bayern Munich, Arsenal, Olympiacos, Dinamo Zagreb.
Group G: Chelsea, Porto, Dynamo Kiev, Maccabi Tel-Aviv.
Group H: Zenit, Valencia, Lyon, Gent.