Joshua Kimmich has signed a three-year contract extension with Bayern Munich which takes his deal up to June 2023.
The versatile 23-year-old has been capped 23 times for Germany since joining Bayern from RB Leipzig in 2015.
Kimmich is capable of playing as a defensive midfielder but it is at right back where he has flourished for Bayern, establishing himself as the long-term heir to former Germany captain Philippe Lahm.
Bayern chairman Karl-Heinz Rummenigge said: "Over the last two and a half years, Joshua has developed into a mainstay of our team. That's why we're extremely pleased we've secured his services for the long term.
"Thanks to his extremely positive progress in the right-back position, FC Bayern has achieved a seamless transition to the future."
Kimmich's previous contract with Bayern was set to run until June 2020 and he is proud the club were so keen to secure his long-term future.
"I'm very happy I've extended my contract so early. It shows the club and the officials have a lot of trust in me and see me as an important factor for FC Bayern's long-term sporting success. It makes me proud," said Kimmich.
"I'm grateful that I've always been able to develop at the highest possible level, and that it'll go on - and that I have the best conditions to take on an important role, in the national team too.
Kimmich, who has scored 13 goals in 109 appearances for the German champions, looks on course to win a third successive Bundesliga title this season with Bayern 20 points clear of second-placed Schalke.
Kimmich added: "My goals and the club's goals for the coming years are very ambitious, and I want to play my part and do everything to achieve them with the team."