Lionel Messi has agreed terms with Barcelona over a new two-year contract extension.

Barca confirmed on their official website the Argentinian would pen the deal "in the coming weeks".

Barca also revealed Xavi and Carles Puyol had agreed extensions until 2016.

Messi's current deal runs until June 2016 and the new agreement will keep him at the Nou Camp beyond his 31st birthday.