'Criminal Minds'

According to Deadline.com, Gibson has signed on the dotted line in an 11th-hour deal just two weeks before production's due to get underway on the upcoming season.

He has agreed to stay with the procedural drama for two more years in a deal that will net him a mid-to-high seven-figures, plus a signing bonus.

Gibson is reportedly doubling his salary, which is currently estimated to be $100,000 per episode. The pay hike puts him in the same scale as 'Bones' star David Boreanaz, Jeffrey Donovan ('Burn Notice') and Julianna Margulies ('The Good Wife').

The deal comes after a tense few weeks for the 'Criminal Minds' writers and producers: Although Gibson was still honoring his contractual obligations to the series, with no deal in place it was hard for them to plot the new season without knowing if he would be back.

Now that Gibson's definitely onboard, 'Criminal Minds' will return in the fall with its post-Mandy Patinkin cast intact. After a tumultuous year off-screen -- full of hirings, firings and re-hirings -- Gibson will once again be joined on-screen by Shemar Moore, Paget Brewster, A.J. Cook, Joe Mantegna, Matthew Gray Gubler and Kristen Vangsness.

Hopefully 'Criminal Minds' will now be able to put all of its recent behind-the-scenes drama behind it and refocus on the work of the fictional B.A.U. profilers instead.

'Criminal Minds' Season 7 is due to premiere in September on CBS.