Though it looked like B.J. Penn's fighting days were over, UFC president Dana White announced on Wednesday evening's edition of UFC Tonight that the former lightweight and welterweight champion has signed a new deal with the fight promotion and will be facing Frankie Edgar in a rubber match after the two serve as coaches on the nineteenth season of The Ultimate Fighter.

White revealed that original plans had Edgar, a former lightweight champion, slated to fight Urijah Faber, but that those plans fell through when neither man agreed to change weight classes.

Penn was selected for the position after he texted Dana White asking for a fight with Edgar. The two originally met to dispute the lightweight title on two separate occasions. Edgar controversially defeated Penn to claim the 155lbs. title in their first clash and then defended the title against "The Prodigy" in a rematch. Penn has apparently stayed in training during his long layoff and "wants this fight more than anything."

Penn and Edgar will face off at 145lbs., where Edgar has been competing lately. It will be Penn's first bout at featherweight, having spent his last several fights competing at welterweight. The 34-year-old Penn indicated to White that he's hunting for a title and the UFC president said that he'll be on his way with a win over Edgar.

The Ultimate Fighter 19 is expected to air in January, with the two coaches to do battle at a currently unscheduled event in April.

Got a news tip or correction? Send it to us by clicking here.