Another UFC vs. Strikeforce fight has been made official by the UFC for April, as Nate Diaz will take on Josh Thomson.

The event, UFC on Fox 7, goes down April 20 from San Jose. The card features Benson Henderson-Gilbert Melendez for the UFC lightweight title, and Frank Mir-Daniel Cormier in the co-main event.

Diaz (16-8) will be looking to get back on track after a loss to Henderson this past December.

Thomson (19-5) is returning to the UFC for the first time since 2004, where he went 2-1. His last fight was a loss to Melendez for the Strikeforce title.