Barcelona star Lionel Messi has agreed a new contract, the Camp Nou club have confirmed.
Messi extended his stay with the Catalan club until 2018 last year, but has long been anticipated to sign an improved deal to make him the highest paid player in world football.
The Argentinian was involved in a war of words with Javier Faus in December after the club's vice-president said he saw no reason why Barca should improve Messi's contract "every six months."
Messi hit back by branding Faus as a businessman "who knows nothing about football."
And, after a season that has seen Messi reach the 40-goal mark for the fifth straight year, the 26-year-old has now been rewarded with a new contract.
He is expected to sign the deal in the coming days.
A statement on the Barcelona website read: "FC Barcelona has reached an agreement to adjust the terms in the contract binding Leo Messi to the club as a professional first team player. The revised and updated contract will be signed over the next few days."
It has been a campaign of frustration for Messi, despite his fine goalscoring record, due to a number of injuries including a hamstring problem that kept him out of action for almost two months from November to early January.
Barca have been below par for much of the campaign in both domestic and European competition, losing the Copa del Rey final to Real Madrid and suffering a quarter-final exit from the UEFA Champions League at the hands of Atletico Madrid.
However, Gerardo Martino's men will have the chance for revenge on Sunday as they host Atletico in a Spanish title decider knowing that victory will secure a 23rd Liga crown and Messi's 22nd trophy with the club.
Martino implied that the announcement of Messi's new deal will relax his side ahead of the mammoth clash with Diego Simeone's team.
"I'm sure it will be relaxing for Leo and the club if they can have the best player in the world staying with the club," Martino said.
"It'll be good for him and good for the club because he'll be able to bring that sense of relaxation out onto the pitch with him."
|Augusto: I convinced Oscar to come to China|
|Madrid-bound Maradona visits Napoli training|
|Sevilla in no rush over Sampaoli talks despite Barcelona links|
|Cafu: Resurgent Brazil can challenge world´s best|
|Klopp thrilled with Coutinho|
|Manchester United replace Real Madrid as world´s richest club|
|Madrid squad annoyed by defeats - Zidane wants more energy after latest loss|
|Casemiro rues more misery for Madrid against Celta|
|´Job done, let´s go home´ - Klopp happy to avoid extra time with narrow Plymouth win|
|FA Cup Review: Southampton leave it late to beat Norwich|
|Real Madrid 1 Celta Vigo 2: Aspas and Jonny extend Madrid winless run|
|Plymouth Argyle 0 Liverpool 1: Rare Lucas goal sees Klopp´s men through|
|Manchester City in La La Land as Schalke toil underground|
|Cameroon 2 Guinea-Bissau 1: Ngadeu-Ngadjui completes comeback to send Broos´ men top|
|Monaco confirm signing of Ajax teenager Antonucci|
|Manchester United´s interest in Griezmann is unsurprising - Simeone|
|Bamford ends spell in Chelsea wilderness with Boro return|
|Louis the great - Luis Enrique explains his and Barca´s debt to Van Gaal|
|Gabon 1 Burkina Faso 1: Spot-on Aubameyang makes his point|
|PSG send Ikone on loan to Montpellier|
|Senegal v Zimbabwe: Cisse wants to live up to favourites tag|
|Ghana´s Rahman leaves AFCON with knee injury|
|Algeria v Tunisia: Mahrez demands improvement in crucial Group B clash|
|Dortmund forward Dembele hits out at Bundesliga refereeing|
|Robben hopes Alonso stays at Bayern amid retirement rumours|
|Asian champions Jeonbuk banned from 2017 Champions League|
|Rakitic still an important player for Barcelona - Luis Enrique|
|Jesus will develop quicker at City - Emerson|
|Always take the weather with you - Spanish snow blights CSKA´s training camp|
|Messi never gave Coach interview, claims father|
|Gotze questions critics but admits to falling short of expecations|
|´Conte can have our title´ - Ranieri wants Chelsea to win the Premier League|
|Tottenham reject Premier League, Bundesliga offers for Wimmer|
|Liverpool sell Ilori to Reading|
|Potential victims in football abuse probe surpasses 500|
|Bonaventura signs new AC Milan contract|
|Messi: Ronaldo has achieved great things|
|Koscielny: Wenger has built men at Arsenal|
|Messi vows to stay at Barcelona ´for as long as they want me´|
|Cafu adamant Neymar will become world´s best|
|I´m just taking a sabbatical - Van Gaal denies he´s retired|
|Not even Gerrard won Premier League - Buttner says he´s not a United flop|
|Samper ignored Wenger as Barca midfielder rejected Arsenal|
|Pleased Pioli wants more from Inter|
|Evergrande boss Scolari dismisses Turan links|
|Klopp seeks legal advice over Matip|
|Marseille complete Sanson move|
|Inter 3 Bologna 2: Candreva prevents remarkable turnaround in Coppa Italia thriller|
|FA Cup Review: Non-league Lincoln stun Ipswich, Burnley and Palace through|
|Gabon v Burkina Faso: Aubameyang says hosts have learned from Guinea-Bissau setback|
|Mali 0 Egypt 0: El-Hadary makes history in stalemate|
|El-Hadary oldest AFCON player ever - 44-year-old Egypt goalkeeper makes history|
|Reus and Gotze on target but Bender injured in Dortmund win|
|Toure shunning lavish China interest to stay at City, says Seluk|
|Rahman´s AFCON in the balance, says Ghana boss Grant|
|Just 14 goals conceded and nine clean sheets - How Vertonghen blow could impact Tottenham|
|Ghana 1 Uganda 0: Andre Ayew hands Black Stars nervy victory|
|Swansea snap up Carroll and Olsson in double swoop|
|All is forgiven? - Costa trains with full Chelsea squad after reported Conte bust-up|
|I would throw myself off a bridge for Luis Enrique - Rakitic dismisses Barca rift rumours|
|Was Juventus´ new logo inspired by tennis star?|
|Smooth sailing for Liverpool in Plymouth? Klopp expects tough test|
|Demichelis re-joins Malaga until end of season|
|Cameroon v Guinea-Bissau: Broos urges new heroes to emerge|
|Boxing champ hits Carragher with Chinese Super League comeback prank|
|Zidane backs Navas and defends Benzema as Madrid aim to bounce back|
|Deportivo bring in Kakuta from Hebei after CSL rule changes|
|Matip could miss eight games without doing anything wrong - Klopp|
|United trigger Valencia´s contract extension|
|Ronaldo returns to Real Madrid´s Copa squad|
|FA fine Sagna for Instagram post|
|Nedved does not foresee more January business for Juventus|
|Rafinha injury blow for Barcelona|
|Villas-Boas fumes at CSL foreign player crackdown|
|Ibrahimovic invaluable to Manchester United youngsters - Rashford|
|Robben rejected China move|
|A-League review: Phoenix rise to the occasion to end Victory´s streak|
|Van Gaal slams English media over treatment at Manchester United|
|Mignolet: Liverpool in better position to win title than in 2013-14|
|Giroud wants Premier League title but understands China temptations|
|Tianjin forced to scrap moves for Costa, Benzema, Cavani and Falcao|
|My goal was better than Mkhitaryan´s - Giroud|
|Pochettino not interested in Argentina job|
|Kane: Tottenham can win Premier League|
|Corinthians dreaming of Drogba - Paulo Roberto|
|Coutinho calls for Liverpool focus|
|Chiellini compares Pogba to LeBron and Bolt|
|Maradona to become Napoli ambassador|
|Mihajlovic furious after Torino collapse|
|Icardi has offers from China - Wanda Nara|
|Pogba can cope with pressure - Ibrahimovic|
|´My half-time words will stay in the dressing room´ - Montella annoyed with AC Milan|