England fast bowler Darren Gough has agreed a new contract to stay at Yorkshire.
Gough, who because of injury has not played a Test match since August 2001, committed his future to the county after talks with chief executive Colin Graves.
Full details of the agreement have not been revealed, but Yorkshire said there was a proviso that the situation would be re-assessed after three months of the season.
A club statement read: "Since returning from Australia injured Darren has worked extremely hard with the medical and coaching staff at Yorkshire to ensure that he can continue his playing career both at county and international level.
"Darren is already engaged in the Yorkshire pre-season preparation schedule and if his fitness progress continues will be playing in Yorkshire's matches at the start of the season.
"Everyone at Yorkshire and I am sure England wish to see Darren Gough fully fit again and it is Darren's intention to continue playing cricket and to regain his international place in the England team."
Gough threatened to Yorkshire after his previous contract finished at the end of last season, but insisted that problems had quickly been ironed out.
"To be honest it has all been settled since October," he said. "All it has centred around is me being fit or showing signs of getting back to full fitness. Yorkshire have been loyal in that respect."
If I didn't think I would be good enough to get back into the England side, I wouldn't be carrying on
The 32-year-old has undergone three operations on a troublesome knee that resulted in him being sent home from England's Ashes tour and missing out on the World Cup.
But he voiced confidence that he had put his injury nightmare behind him and was confident of getting back in the England set-up.
He added: "If I didn't think I would be good enough to get back into the England side, I wouldn't be carrying on.
"But there's no rush. My first aim is to be playing for Yorkshire at the start of the season."
Yorkshire are hoping that Gough can help them win promotion back to Division One of the County Championship after being relegated last summer.
The England selectors, meanwhile, will be closely monitoring the situation.
Gough has taken 228 wickets in 56 Tests and 174 in one-day internationals.