Lionel Messi is set to sign his new Barcelona deal tomorrow.

Barca announced on December 18 that Messi would be extending his current deal, which expires in June 2016, by two years.

It was also announced that day that new contracts would be signed by Carles Puyol and Xavi Hernandez and that pair have already put pen to paper.

Messi, whose new contract will keep him at Barcelona until June 30 2018, is currently in Sweden with the Argentina national team.