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."
|Hart hails West Ham fight under Moyes|
|Conte calls for clarity from Chelsea on Courtois deal|
|West Ham 1 Leicester City 1: Kouyate gets Moyes up and running|
|Manchester United midfielder Carrick undergoes heart procedure|
|Manchester City youngster Bytyqi retires with heart condition|
|Salah could become the Premier League´s greatest African star - Lauren|
|Lauren reserves judgement on Man City´s invincible credentials|
|Bayern boss Heynckes slams ´insanity´ of Champions League ticket prices|
|Messi hails Barcelona team-mates after European Golden Shoe triumph|
|Napoli´s Hamsik saves space for a Serie A title-winning tattoo|
|Jardim urges quick Monaco response to Champions League woe|
|You always have a chance - Wagner hopeful of Man City scalp|
|Chelsea´s tough title defence was to be expected - Klopp|
|Neymar and Cavani bound by common goal at PSG|
|Simeone: Everything seems better when Atletico win|
|Injuries not to blame for Real Madrid LaLiga position - Zidane|
|Icardi could stay at Inter forever, says Spalletti|
|Former England star Owen finishes second on horse racing debut|
|Emery backs Mbappe to shine on Monaco return|
|Robben-less Heynckes handed timely Coman boost|
|Guardiola not complacent ahead of Huddersfield clash|
|Salah not Liverpool´s only threat, insists Conte|
|Klopp trusts Moreno ´100 per cent´ despite Sevilla shocker|
|No excuses for Conte despite Chelsea´s travel trouble|
|Salah has nothing to prove in Chelsea reunion, says Klopp|
|Bale return could be imminent - Zidane|
|Megson´s interim role is no audition as he awaits permanent West Brom boss|
|Bosz has derby focus despite Dortmund criticism|
|Kaka predicts bright future for Milan´s Silva|
|Messi equals Ronaldo with fourth European Golden Shoe|
|Mourinho fears Fellaini exit amid Arsenal, PSG links|
|I don´t know what you want - Mourinho blasts Man United critics|
|Mourinho protecting Pogba and Ibrahimovic as they prepare for Brighton|
|Stoke to offer Crouch fresh deal|
|Del Piero expects Juventus and Dybala to rediscover top form|
|Melbourne City 1 Perth Glory 3: Ten-man hosts pay the penalty|
|Moyes wants greater ref protection for Carroll|
|Unsworth questions players´ commitment after Atalanta embarrassment|
|PSG prepare for Monaco with order restored and European dominance in mind|
|Who, what, when and where? – All you need to know about the 2018 World Cup draw|
|Wenger calms Welbeck injury fears after planned substitution|
|Kaka unsure over playing future amid Milan directorship offer|
|Monaco v Paris Saint-Germain: The Opta facts as Mbappe returns with Neymar in tow|
|Griezmann happy at Atletico, says Koke|
|Ronaldo will deliver when needed for Madrid – Alonso|
|Rodrigo commits to Valencia until 2022|
|Domestic bliss? Montella targets Serie A resurgence after Europa League success|
|Rooney stands by Unsworth after Everton humiliation|
|He deserved more chances – Hazard hails ´top player´ Salah|
|We have to stay awake all the time - Coutinho frustrated after Sevilla collapse|
|Everton 1 Atalanta 5: Cristante and Cornelius knock more shine off Premier League strugglers|
|AC Milan 5 Austria Wien 1: Andre Silva sends Montella´s men through to the last 32|
|Wasteful Arsenal leave Wenger frustrated|
|McInnes to remain at Aberdeen despite links to Rangers, West Brom|
|Robinho given prison sentence in Italy for 2013 sexual assault|
|Cologne 1 Arsenal 0: Gunners secure top spot despite defeat|
|Silva not giving ´one more word´ on Everton speculation|
|Everton sign Bramley Moore Dock lease|
|UEFA investigating Bayern after fans throw fake money in protest over Champions League prices|
|Robben out of Gladbach clash with ´minor´ calf strain|
|Pochettino pleased to see Rose emotion|
|Mourinho factor makes Man Utd a title threat, says Lampard|
|Chelsea´s best chance of success is Champions League, claims Lampard|
|Robben: It could be over for me after this season|
|Newcastle Jets 4 Melbourne Victory 1: Nabbout at the double|
|Happy Sanchez could win the Premier League for Arsenal, Lauren claims|
|Angered Neymar storms away from Real Madrid questions|
|Bayern played their worst ´for a long time´ - Boateng|
|Neymar form no surprise for Alves|
|Federer congratulates Basel after Man Utd scalp|
|Gremio 1 Lanus 0: Cicero gives Brazilians advantage in Libertadores final|
|Hazard: I admire Madrid, but I´m happy at Chelsea|
|Neuer or De Gea? Digne says Ter Stegen is world´s best keeper|
|Allegri satisfied with draw against ´extraordinary´ Barcelona|
|Nainggolan reaffirms Roma commitment after Simeone praise|
|Simeone hails Griezmann´s ´extraordinary´ volley|
|Emery hails Neymar after stunning Celtic win|
|Championship Review: Wolves thrash 10-man Leeds, Middlesbrough cruise|
|Goncharenko delighted for clean sheet star Akinfeev|
|I hope Barcelona rest Messi – Jesus|