Munich - FC Bayern München duo Gianluca Gaudino and Tom Starke have both extended their contracts with the Bundesliga leaders.