A bout two years in the making appears set, as Cesar Gracie confirmed on Twitter that Nick Diaz has signed his contract to face UFC welterweight champion Georges St-Pierre.

GSP asked that he be given Diaz after unifying the titles with a win over Carlos Condit last month. Diaz is currently suspended, but is expected to be given his fight license in February after re-applying.

The bout is slated for UFC 158 in Montreal this March.