Barcelona striker Lionel Messi has agreed a contract extension which will keep him at the club until 2021.

The 30-year-old, who joined Barca aged 13, will sign the deal when he returns to training from pre-season.

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

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

Messi, who is currently on honeymoon after marrying childhood sweetheart Antonela Roccuzzo, is also La Liga’s record scorer on 349 goals.