Manuel Neuer has signed a contract extension with Bayern Munich to keep him at the club until 2023.
Goalkeeper Neuer's contract had been due to expire at the end of next season.
Doubts over the 34-year-old's future at the club were raised when Bayern made the signing of Schalke's Alexander Nubel, who will move to the Allianz Arena at the end of the season.
However, Neuer will not be leaving for pastures new, with the Germany international telling Bayern's official website: "During the weeks of the shutdown for the coronavirus pandemic, I didn't want to make a decision because nobody knew if, when and how Bundesliga football would continue.
"It was important for me to continue working with our goalkeeping coach Toni Tapalovic. Now this has been resolved, I look to the future with great optimism.
"I feel very comfortable and at home in Bavaria. FC Bayern are one of Europe's top football clubs."