Xavi described himself as "thrilled" after signing a two-year contract extension with Al Sadd.
The Doha club confirmed the news on Thursday in a move that will see the former Barcelona and Spain star still playing at the age of 40.
And Xavi, who made the switch to Al Sadd in 2015 after a trophy-laden spell at Camp Nou, was excited to extend his stay.
"I am happy to keep on being a part of the Al Sadd family for two more years," he said.
"I am delighted to be at the club and with its fans. Everyone here is one big family and I am satisfied and thrilled to continue."
OFFICIAL: The Maestro stays!Our captain Xavi has extended his contract with and will remain with the club for another two years May 24, 2018
Xavi won 133 caps for Spain, playing a key role in the side that triumphed in successive European Championships either side of World Cup glory in 2010.
His Barca career spanned 17 years and saw Xavi make 869 appearances, scoring 97 goals.
Al Sadd have won the Qatar Cup, Emir Cup and Sheikh Jassim Cup during Xavi's stay.
Get the best features, fun and footballing frolics straight to your inbox every week.
Thank you for signing up to Four Four Two. You will receive a verification email shortly.
There was a problem. Please refresh the page and try again.