diff --git a/src/plugins/mapservices/openstreetmap.py b/src/plugins/mapservices/openstreetmap.py
index b28b67ad5..f9430f278 100644
--- a/src/plugins/mapservices/openstreetmap.py
+++ b/src/plugins/mapservices/openstreetmap.py
@@ -62,10 +62,10 @@ class OpensStreetMapService(MapService):
         city = place.get_main_location().get_city()
         country = place.get_main_location().get_country()
         if city and country:
-            self.url = "http://gazetteer.openstreetmap.org/namefinder/"\
-                        "?find=%s%%2C%s" % (city, country)
+            self.url = "http://open.mapquestapi.com/nominatim/v1/"\
+                        "search.php?q=%s%%2C%s" % (city, country)
             return
         
         titledescr = place.get_title()
-        self.url = "http://gazetteer.openstreetmap.org/namefinder/"\
-                        "?find=%s" % '+'.join(titledescr.split())
+        self.url = "http://open.mapquestapi.com/nominatim/v1/"\
+                        "search.php?q=%s" % '+'.join(titledescr.split())