Nate Diaz-Conor McGregor Rematch Official for UFC 202 on Aug. 20

The rematch is coming! #UFC202: @NateDiaz209 vs @TheNotoriousMMA 2 8/20/16 https://t.co/1tv9SG2JQX

— #UFC199 (@ufc) June 5, 2016

Nate Diaz hinted at it earlier in the evening and now it’s official: Diaz will rematch Conor McGregor in the UFC 202 headliner on Aug. 20.

The promotion announced the welterweight bout during the UFC 199 broadcast on Saturday night. A location and venue for the event was not revealed.

Negotiations for the bout played out in a very public forum over the past few weeks after the originally planned rematch date at UFC 200 fell through. UFC CEO Lorenzo Fertitta and UFC President Dana White recently traveled to meet with both McGregor and Diaz to hammer out a deal, and after some rough patches, all parties were able to come to terms.

McGregor was supposed to face Rafael dos Anjos for the lightweight title at UFC 196 on March 5, but the champion had to withdraw from the bout due to injury. Diaz stepped in on short notice and submitted “The Notorious” Irishman with a second-round rear-naked choke in a matchup that was contested at 170 pounds.

It was the first loss in eight UFC appearances for McGregor, who was coming off a 13-second knockout of Jose Aldo in December to win the featherweight crown. Diaz has won three of his last four in the Octagon.