Barcelona have received a boost ahead of their Atletico Madrid clash, with Lionel Messi signing a new contract.

Messi put pen to paper on a new deal which will reportedly see him earn more than 10 million euros per year to remain at the Nou Camp until 2016.

The Argentina forward, still only 22, has already scored 89 goals in 184 appearances for Barcelona and was instrumental as the Catalans scooped an historic treble of league, Copa del Rey and Champions League titles last season.

And the South American already has three goals to his name this term in all competitions, despite missing his side's opening league game at home to Sporting Gijon, which Barca won 3-0.

Messi was on international duty for Argentina at the time, but returned to help his side to a 2-0 win at Getafe last weekend, when he came off the bench to score.

Barcelona coach Pep Guardiola was delighted with Messi's contract renewal.

"It's an immense piece of news, as were the renewals of Victor Valdes and Xavi," he said.

"People go to watch football to see the best players, and they are the best."

Guardiola hinted captain Carles Puyol could be the next big name to sign a new deal.

Puyol's current contract runs out at the end of this season and there had been speculation Barca would allow the defender to leave.

But Guardiola insists he wants Puyol to stay.

"My wish is that he stays because he has all the qualities necessary, he gives us options and solutions, and is selfless," he said. "It depends on him."

Puyol and Messi both played the 90 minutes as Barcelona were held to a goalless draw at Inter Milan in the Champions League on Wednesday.

Both look set to start again tomorrow against a wounded Atletico side, although Guardiola has options in both positions.

Andres Iniesta is close to full fitness after injury and has appeared as substitute in both of the Catalans' last two matches.

The Spain midfielder may start tomorrow, while Pedro is also pushing for a start on the right following some decent performances this season.

At the back, Guardiola welcomes back Rafael Marquez from injury and may hand a home debut to recent signing Dmytro Chygrynskiy.

The former Shakhtar Donetsk defender played against Getafe last week in Madrid, but is eager to make his Nou Camp bow.

"I can only imagine what it feels like to step out on the pitch at the Nou Camp," he said.

"I await my (home) debut with excitement and impatience."

Barcelona are one of four sides to have won both of their opening two league matches and sit at the top of the table on goal difference, just above Real Madrid, Valencia and Athletic Bilbao.

Gabi Milito remains sidelined for Barca, but Guardiola should have an otherwise full-strength squad to choose from for tomorrow's match.

But the Barca coach is wary of a wounded Atletico outfit, who come to the Nou Camp with just one point from two games following a poor start to the season.

"Atletico are one of the big clubs and I would have preferred them to come here in better spirits," he said.

"If there is a team that is dangerous in those circumstances, it is Atletico Madrid."

But the visitors will be without a host of first-team players tomorrow.

Raul Garcia, Mariano Pernia and Ignacio Camacho are injured, while Sergio Asenjo, Alvaro Dominguez and Leandro Cabrera have been called up to the Under-20 World Cup and are all missing.

Coach Abel Resino has therefore included several youth-team players to his squad to face Barca, while there are recalls for Antonio Lopez and Jose Antonio Reyes, who were both left out of Tuesday night's hugely disappointing goalless draw at home to Apoel Nicosia in the Champions League.

Atletico do, however, have a good record against Barcelona in recent seasons and Resino reckons the Catalans will not be looking forward to facing his side.

"Atletico make Barcelona feel insecure," he said. "Last year we were losing and we came back to beat them."

That was at the Vicente Calderon, however, and to beat Barcelona at the Nou Camp, Resino knows his side need to produce an imperious defensive display.

"To beat Barcelona, you need to defend really well because they are probably the best attacking side in the world," he said.