Alberto Contador will rejoin Team Saxo Bank once he has served his doping ban, the Danish team have announced.
The Spanish rider was stripped of his 2010 Tour de France victory after testing positive for clenbuterol, after which he was handed a two-year ban back-dated to January 2011.
He had already served a provisional suspension of nearly six months, though, meaning he will be able to ride once more on August 5.
And Saxo Bank have signed up the 29-year-old for the remainder of this season and the next three years.
Team owner Bjarne Riis said: "A lot of speculation and rumours have surrounded Alberto Contador and his future in the past months, but our sponsors, the team and Alberto have shared the same wish to continue and build on our relationship.
"Throughout these last two tough years we have stood by Alberto, so to be able to announce his return to the team is something I have been really looking forward to. Now we can put an end to this speculation and start focusing on building the team for the coming years."
Contador added: "The decision to return to Team Saxo Bank has actually been pretty easy, and my first priority was always to rejoin the team and to continue working with Bjarne Riis, and the rest of the team.
"The support I have experienced from them in a very difficult situation is extraordinary. I'm really looking forward to getting back on the bike, and my aim is to repay that support, hopefully with some great results."