Conor McGregor will get his rematch with Nate Diaz at UFC 202 in Las Vegas on August 20.
The mixed martial arts promotion officially announced the match 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.
The 31-year-old (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.
Meanwhile, former UFC heavyweight champion Brock Lesnar will return to mixed martial arts with a bout at UFC 200 in Las Vegas next month.
Lesnar is one of the biggest pay-per-view stars in UFC history, setting records for the promotion during his eight-fight MMA career between stints as a professional wrestler.
He won the heavyweight title by stopping Randy Couture in his fourth fight, and he defended the belt at the record-setting UFC 100 in 2009.
Lesnar has not fought in the UFC since 2011, when he lost his second straight bout. He eventually returned to the WWE, but said he kept training in MMA.
The UFC are yet to announce an opponent for Lesnar, who turns 39 next month.