diff --git a/searx/engines/openstreetmap.py b/searx/engines/openstreetmap.py
index 36b6011e..be775122 100644
--- a/searx/engines/openstreetmap.py
+++ b/searx/engines/openstreetmap.py
@@ -9,20 +9,23 @@
 # @parse       url, title
 
 from json import loads
+from searx.utils import searx_useragent
 
 # engine dependent config
 categories = ['map']
 paging = False
 
 # search-url
-url = 'https://nominatim.openstreetmap.org/search/{query}?format=json&polygon_geojson=1&addressdetails=1'
-
+base_url = 'https://nominatim.openstreetmap.org/search/{query}?format=json&polygon_geojson=1&addressdetails=1'
 result_base_url = 'https://openstreetmap.org/{osm_type}/{osm_id}'
 
 
 # do search-request
 def request(query, params):
-    params['url'] = url.format(query=query)
+    params['url'] = base_url.format(query=query)
+
+    # using searx User-Agent
+    params['headers']['User-Agent'] = searx_useragent()
 
     return params
 
diff --git a/searx/engines/photon.py b/searx/engines/photon.py
new file mode 100644
index 00000000..f4a1254a
--- /dev/null
+++ b/searx/engines/photon.py
@@ -0,0 +1,121 @@
+## Photon (Map)
+#
+# @website     https://photon.komoot.de
+# @provide-api yes (https://photon.komoot.de/)
+#
+# @using-api   yes
+# @results     JSON
+# @stable      yes
+# @parse       url, title
+
+from urllib import urlencode
+from json import loads
+from searx.utils import searx_useragent
+
+# engine dependent config
+categories = ['map']
+paging = False
+language_support = True
+number_of_results = 10
+
+# search-url
+search_url = 'https://photon.komoot.de/api/?{query}&limit={limit}'
+result_base_url = 'https://openstreetmap.org/{osm_type}/{osm_id}'
+
+
+# do search-request
+def request(query, params):
+    params['url'] = search_url.format(query=urlencode({'q': query}),
+                                      limit=number_of_results)
+
+    if params['language'] != 'all':
+        params['url'] = params['url'] + "&lang=" + params['language'].replace('_', '-')
+
+    # using searx User-Agent
+    params['headers']['User-Agent'] = searx_useragent()
+    
+    # FIX: SSLError: [Errno 1] _ssl.c:510: error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed
+    params['verify'] = False
+
+    return params
+
+
+# get response from search-request
+def response(resp):
+    results = []
+    json = loads(resp.text)
+
+    # parse results
+    for r in json.get('features', {}):
+    
+        properties = r.get('properties')
+        
+        if not properties:
+            continue
+        
+        # get title
+        title = properties['name']
+        
+        # get osm-type
+        if properties.get('osm_type') == 'N':
+            osm_type = 'node'
+        elif properties.get('osm_type') == 'W':
+            osm_type = 'way'
+        elif properties.get('osm_type') == 'R':
+            osm_type = 'relation'
+        else:
+            # continue if invalide osm-type
+            continue
+            
+        url = result_base_url.format(osm_type=osm_type,
+                                     osm_id=properties.get('osm_id'))
+
+        osm = {'type': osm_type,
+               'id': properties.get('osm_id')}
+
+        geojson = r.get('geometry')
+        
+        if  properties.get('extent'):
+            boundingbox = [properties.get('extent')[3], properties.get('extent')[1], properties.get('extent')[0], properties.get('extent')[2]]
+        else:
+            # TODO: better boundingbox calculation
+            boundingbox = [geojson['coordinates'][1], geojson['coordinates'][1], geojson['coordinates'][0], geojson['coordinates'][0]]
+        
+        # TODO: address calculation
+        address = {}
+
+        # get name
+        if properties.get('osm_key') == 'amenity' or\
+           properties.get('osm_key') == 'shop' or\
+           properties.get('osm_key') == 'tourism' or\
+           properties.get('osm_key') == 'leisure':
+            address = {'name': properties.get('name')}
+                
+        # add rest of adressdata, if something is already found
+        if address.get('name'):
+            address.update({'house_number': properties.get('housenumber'),
+                           'road': properties.get('street'),
+                           'locality': properties.get('city',
+                                       properties.get('town',
+                                       properties.get('village'))),
+                           'postcode': properties.get('postcode'),
+                           'country': properties.get('country')})
+        else:
+            address = None
+
+        # append result
+        results.append({'template': 'map.html',
+                        'title': title,
+                        'content': '',
+                        'longitude': geojson['coordinates'][0],
+                        'latitude': geojson['coordinates'][1],
+                        'boundingbox': boundingbox,
+                        'geojson': geojson,
+                        'address': address,
+                        'osm': osm,
+                        'url': url})
+
+        print r['properties']['name']
+
+    # return results
+    return results
diff --git a/searx/settings.yml b/searx/settings.yml
index b51b37f1..3a52dae3 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -95,6 +95,10 @@ engines:
     engine : openstreetmap
     shortcut : osm
 
+  - name : photon
+    engine : photon
+    shortcut : ph
+
 #  - name : piratebay
 #    engine : piratebay
 #    shortcut : tpb