Real Madrid will play PSG in the Champions League last 16 after the draw for the knockout stages took place for a second time.
A “technical problem” caused an error in the initial draw, which Uefa said had been “declared void”.
Holders Chelsea face Ligue 1 champions Lille and Premier League champions Manchester City come up against Portugal’s Sporting Lisbon.
Six-time winners Liverpool play three-time winners Inter Milan.
Champions League last-16 draw:
Red Bull Salzburg v Bayern Munich
Sporting Lisbon v Manchester City
Benfica v Ajax
Chelsea v Lille
Atletico Madrid v Manchester United
Villarreal v Juventus
Inter Milan v Liverpool
PSG v Real Madrid