Editors of OpenStreetMap can use my software to search for a place or region, generating a list of candidate matches from Wikidata, which can then be checked and saved to OpenStreetMap. Linking the two projects isn't without controversy. They use different licenses which raises questions about what information from one project can be copied to the other. This presentation will give details of a new version of the editing tool. The benefits of linking, the process of finding matches, the community response - including the controversy - and how people can get involved will be discussed.