Bayern Munich defender Joshua Kimmich has committed himself to the Bundesliga champions by signing a contract until 2023, the club have announced.
Kimmich, 23, has made 71 league appearances since joining Bayern for €7.5 million from Stuttgart in 2015.
"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," Kimmich said.
"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.
"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."
Kimmich played 39 times for Bayern in all competitions last season, making 19 appearances as a substitute under former coach Carlo Ancelotti.
After expressing frustration with that lack of playing time, Kimmich was linked with Barcelona, Atletico Madrid, Manchester United and Manchester City.
"Over the last two and a half years, Joshua has developed into a mainstay of our team," Bayern chairman Karl-Heinz Rummenigge added. "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."
The defender has succeeded former Bayern captain Philipp Lahm at right-back for both club and country, making 25 appearances and scoring three goals for Germany.