Michael Vaughan has accepted the offer of a rolling contract with Yorkshire which will keep him at the club for the rest of his career.
Vaughan remains committed to the Yorkshire cause
However, the agreement will only take effect when he is no longer centrally contracted by England.
"I am delighted to be signing a new contract which gives me the flexibility to remain with the county while ever I can play first-class cricket," he said.
Vaughan has not played cricket since undergoing knee surgery in July.
But his recovery is going well and he hopes to make his comeback for England early next year in the one-day series which follows the Ashes Tests in Australia.
"He is determined to be fit as soon as possible and is very focused on what needs to be done to make this happen," Yorkshire chief executive Stewart Regan told the club's website.
"We fully expect Michael to recover from his operation and are putting our faith in him with a new contract which will kick in once he leaves the England team."
Vaughan made his Yorkshire first team debut in 1993 and was capped two years later.
He was a member of the side which won the county title in 2001 and the C&G Trophy at Lord's the following summer.