Lots of way-tracing from Yahoo. Now Madrid has some suburbs, though I am glad I do not live there.
also adding some towns and villages further out towards Toledo.
Comment from BlueMM on 29 October 2008 at 04:09
AFAIK, you can't use Geonames data in OSM. Geonames get data from anywhere it can, and doesn't meet the OSM license requirements. See http://wiki.openstreetmap.org/index.php/Geonames
As always for new data sources, if it's not mentioned that is ok to use on the wiki, bring it up on the legal mailing list to verify it's fine to use.