Fifa has resolved its differences with the World Anti-Doping Agency - which paves the way for football to take place at the Athens Olympics in August. Football's world governing body signed a drugs policy declaration, retaining "individual case management".
This will allow Fifa to judge each case on its merits rather than follow Wada's strict two-year ban for offences.
Wada, meanwhile, will have the right to appeal should it feel that Fifa has been too lenient in its punishment.
Fifa president Sepp Blatter signed the declaration of intent flanked by Wada chairman Dick Pound and International Olympic Committee president Jacques Rogge.
The signing effectively eliminates any danger of football being barred from the 2004 Olympics.