David Marshall has signed a four-year extension to his contract with Cardiff City, two days before the derby with Swansea City.

The Scotland goalkeeper, who has committed to Cardiff until the summer of 2018, has already proved the busiest custodian in the Barclays Premier League with 88 saves in City's first season in the top flight. His second-half performance against Norwich City last weekend allowed his side to climb off the bottom of the table.

"We know now we have one of the best goalkeepers in the country committed to us for years to come," said Cardiff manager Ole Gunnar Solskjaer. Marshall has kept five clean sheets this season and has missed just one league game since November 2011.