The Icelandic international, currently away with Iceland for their match against Slovenia on Friday, joined City in 2011 from Coventry.
The 23 year olds current deal was due to expire in 2014 but it's been extended for two more years.
New deal for Gunnarsson