INGLEWOOD, Calif. — Conor McGregor will get his rematch with Nate Diaz at UFC 202 in Las Vegas on Aug. 20.

The mixed martial arts promotion officially announced the matchup during the pay-per-view UFC 199 show at the Forum on Saturday night.

Diaz posted one of the biggest upsets in recent UFC history when he beat McGregor by submission in the second round at UFC 196 in March. Diaz (19-10) won the welterweight bout and ended the 15-fight winning streak of McGregor (19-3), the UFC featherweight champion fighting 25 pounds above his usual weight.

The fighters and the UFC have sparred over the terms of the rematch. The UFC initially scheduled it for the historic UFC 200 card in Las Vegas next month, but scrapped it in a dispute with the Irish superstar.