Antoine Griezmann has agreed upon an extension to remain with Atletico Madrid through 2021.

Griezmann had been linked to a transfer away from Atleti.

Griezmann signed from Real Sociedad in the summer of 2014 after Diego Costa left for Chelsea.

"On a personal level, I would like to improve my goal scoring, minutes played, matches played, assists... my goal is always to improve upon what I have done the season before," Griezmann told the club's official website. "On a team level, we would also like to improve upon last season.

"The most basic thing is to continue with the key players we have and with our coach. We have the good fortune that the club wants to continue to improve and be a top club and that allows us to continue to grow.

"I can only thank the fans for all the support they have always given to this team and ask them to continue to support us as they have done up to this point. As for me, I want to say that I will continue to give my all on the pitch to thank them for all the kindness they show me."