Floyd Mayweather Jr and Arturo Gatti's much-anticipated world title clash should go ahead on 25 June after the pair's management finally agreed terms. Former world lightweight champion Mayweather is undefeated in 33 bouts and looking for a third world title.
"I am so happy it's resolved. I can't wait to get back in the gym so I can punish him," said WBC light welterweight champion Gatti.
Terms were agreed on Thursday and the bout should happen in Atlantic City.
Mayweather said: "This will be a great fight for the public. And I want the fans to know that I will be victorious."
Mayweather's promoter Bob Arum said: "This is the fight the public demands. It will be the biggest junior welterweight fight ever."
The fight was supposed to have taken place on 11 June but Mayweather and his Top Rank team failed to sign in time and the much-anticipated bout looked to be off.
British light welterweight champion Junior Witter was ready to step in had the fight fallen through.
Meanwhile, Arum has managed to get Miguel Cotto's date at Madison Square Garden moved to 11 June - the night before New York's big Puerto Rican Day parade.
Gatti's most recent bout in his 39-6 (30 KOs) career was a fifth-round knockout against Jesse James Leija last June.
Mayweather, who has notched up 22 KOs in his career, stopped Henry Bruseles on 22 January.