Lionel Messi has agreed a 4-year contract extension at Barcelona, that will see him remain at the club until 2021.

“The club is very happy with the renewal and commitment of Messi, the best player in history,” said the La Liga club.

The deal will be completed when Messi returns from his honeymoon in 2 weeks.

ALSO: Lionel Messi – “Cristiano Ronaldo is a phenomenal player”

The Argentina forward has scored a club-record 507 goals in 583 matches since his competitive debut in 2004.

In a statement, Barca said Messi has “led the team to an era of extraordinary success, the likes of which has never been seen in world football”.

“Leo Messi will not stop there – the Argentinian is in one of the best moments of his career and still has a lot more left to give, which is music to the ears of all Barca fans who will get to continue marvelling at his greatness for at least another four years,” the statement added.

Since breaking into the first team under former Barca boss Frank Rijkaard, Messi has won eight La Liga titles, the Champions League four times and the Copa del Rey on five occasions.