diff --git a/data/presets.yaml b/data/presets.yaml
index b5795da42..50674c555 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1323,6 +1323,10 @@ en:
         name: Fast Food
         # 'terms: restaurant'
         terms: "<translate with synonyms or related terms for 'Fast Food', separated by commas>"
+      amenity/ferry_terminal:
+        # amenity=ferry_terminal
+        name: Ferry Terminal
+        terms: "<translate with synonyms or related terms for 'Ferry Terminal', separated by commas>"
       amenity/fire_station:
         # amenity=fire_station
         name: Fire Station
@@ -1350,6 +1354,10 @@ en:
         name: Hospital Grounds
         # 'terms: clinic,doctor,emergency room,health service,hospice,infirmary,institution,nursing home,sanatorium,sanitarium,sick,surgery,ward'
         terms: "<translate with synonyms or related terms for 'Hospital Grounds', separated by commas>"
+      amenity/hunting_stand:
+        # amenity=hunting_stand
+        name: Hunting Stand
+        terms: "<translate with synonyms or related terms for 'Hunting Stand', separated by commas>"
       amenity/kindergarten:
         # amenity=kindergarten
         name: Preschool/Kindergarten Grounds
@@ -1381,6 +1389,10 @@ en:
         # amenity=parking_entrance
         name: Parking Garage Entrance/Exit
         terms: "<translate with synonyms or related terms for 'Parking Garage Entrance/Exit', separated by commas>"
+      amenity/parking_space:
+        # amenity=parking_space
+        name: Parking Space
+        terms: "<translate with synonyms or related terms for 'Parking Space', separated by commas>"
       amenity/pharmacy:
         # amenity=pharmacy
         name: Pharmacy
@@ -1586,6 +1598,10 @@ en:
         name: Waste Basket
         # 'terms: bin,rubbish,litter,trash,garbage'
         terms: "<translate with synonyms or related terms for 'Waste Basket', separated by commas>"
+      amenity/water_point:
+        # amenity=water_point
+        name: RV Drinking Water
+        terms: "<translate with synonyms or related terms for 'RV Drinking Water', separated by commas>"
       area:
         # area=yes
         name: Area
@@ -3708,6 +3724,10 @@ en:
         # 'waterway=*'
         name: Waterway
         terms: "<translate with synonyms or related terms for 'Waterway', separated by commas>"
+      waterway/boatyard:
+        # waterway=boatyard
+        name: Boatyard
+        terms: "<translate with synonyms or related terms for 'Boatyard', separated by commas>"
       waterway/canal:
         # waterway=canal
         name: Canal
@@ -3720,6 +3740,10 @@ en:
         # waterway=ditch
         name: Ditch
         terms: "<translate with synonyms or related terms for 'Ditch', separated by commas>"
+      waterway/dock:
+        # waterway=dock
+        name: Dock
+        terms: "<translate with synonyms or related terms for 'Dock', separated by commas>"
       waterway/drain:
         # waterway=drain
         name: Drain
@@ -3748,6 +3772,10 @@ en:
         name: Stream
         # 'terms: beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse'
         terms: "<translate with synonyms or related terms for 'Stream', separated by commas>"
+      waterway/water_point:
+        # waterway=water_point
+        name: Marine Drinking Water
+        terms: "<translate with synonyms or related terms for 'Marine Drinking Water', separated by commas>"
       waterway/weir:
         # waterway=weir
         name: Weir
diff --git a/data/presets/presets.json b/data/presets/presets.json
index ff63584fe..71331cbc1 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -970,6 +970,21 @@
         ],
         "name": "Fast Food"
     },
+    "amenity/ferry_terminal": {
+        "fields": [
+            "operator"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "terms": [],
+        "tags": {
+            "amenity": "ferry_terminal"
+        },
+        "name": "Ferry Terminal"
+    },
     "amenity/fire_station": {
         "icon": "fire-station",
         "fields": [
@@ -1086,6 +1101,18 @@
         },
         "name": "Hospital Grounds"
     },
+    "amenity/hunting_stand": {
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "terms": [],
+        "tags": {
+            "amenity": "hunting_stand"
+        },
+        "name": "Hunting Stand"
+    },
     "amenity/kindergarten": {
         "icon": "school",
         "fields": [
@@ -1222,6 +1249,21 @@
         },
         "name": "Parking Garage Entrance/Exit"
     },
+    "amenity/parking_space": {
+        "fields": [
+            "capacity"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "terms": [],
+        "tags": {
+            "amenity": "parking_space"
+        },
+        "name": "Parking Space"
+    },
     "amenity/pharmacy": {
         "icon": "pharmacy",
         "fields": [
@@ -2150,6 +2192,17 @@
         ],
         "name": "Waste Basket"
     },
+    "amenity/water_point": {
+        "geometry": [
+            "area",
+            "vertex",
+            "point"
+        ],
+        "tags": {
+            "amenity": "water_point"
+        },
+        "name": "RV Drinking Water"
+    },
     "area": {
         "name": "Area",
         "tags": {
@@ -10318,6 +10371,20 @@
         "searchable": false,
         "name": "Waterway"
     },
+    "waterway/boatyard": {
+        "fields": [
+            "operator"
+        ],
+        "geometry": [
+            "area",
+            "vertex",
+            "point"
+        ],
+        "tags": {
+            "waterway": "boatyard"
+        },
+        "name": "Boatyard"
+    },
     "waterway/canal": {
         "icon": "waterway-canal",
         "fields": [
@@ -10357,6 +10424,17 @@
         },
         "name": "Ditch"
     },
+    "waterway/dock": {
+        "geometry": [
+            "area",
+            "vertex",
+            "point"
+        ],
+        "tags": {
+            "waterway": "dock"
+        },
+        "name": "Dock"
+    },
     "waterway/drain": {
         "icon": "waterway-stream",
         "fields": [
@@ -10501,6 +10579,17 @@
         },
         "name": "Stream"
     },
+    "waterway/water_point": {
+        "geometry": [
+            "area",
+            "vertex",
+            "point"
+        ],
+        "tags": {
+            "waterway": "water_point"
+        },
+        "name": "Marine Drinking Water"
+    },
     "waterway/weir": {
         "icon": "dam",
         "geometry": [
diff --git a/data/taginfo.json b/data/taginfo.json
index 1a7610f48..d2931d9d3 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -224,6 +224,10 @@
             "key": "amenity",
             "value": "fast_food"
         },
+        {
+            "key": "amenity",
+            "value": "ferry_terminal"
+        },
         {
             "key": "amenity",
             "value": "fire_station"
@@ -248,6 +252,10 @@
             "key": "amenity",
             "value": "hospital"
         },
+        {
+            "key": "amenity",
+            "value": "hunting_stand"
+        },
         {
             "key": "amenity",
             "value": "kindergarten"
@@ -276,6 +284,10 @@
             "key": "amenity",
             "value": "parking_entrance"
         },
+        {
+            "key": "amenity",
+            "value": "parking_space"
+        },
         {
             "key": "amenity",
             "value": "pharmacy"
@@ -444,6 +456,10 @@
             "key": "amenity",
             "value": "waste_basket"
         },
+        {
+            "key": "amenity",
+            "value": "water_point"
+        },
         {
             "key": "area",
             "value": "yes"
@@ -2393,6 +2409,10 @@
         {
             "key": "waterway"
         },
+        {
+            "key": "waterway",
+            "value": "boatyard"
+        },
         {
             "key": "waterway",
             "value": "canal"
@@ -2405,6 +2425,10 @@
             "key": "waterway",
             "value": "ditch"
         },
+        {
+            "key": "waterway",
+            "value": "dock"
+        },
         {
             "key": "waterway",
             "value": "drain"
@@ -2429,6 +2453,10 @@
             "key": "waterway",
             "value": "stream"
         },
+        {
+            "key": "waterway",
+            "value": "water_point"
+        },
         {
             "key": "waterway",
             "value": "weir"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index b18d563cc..6d8f15dad 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1730,6 +1730,10 @@
                 "name": "Fast Food",
                 "terms": "restaurant"
             },
+            "amenity/ferry_terminal": {
+                "name": "Ferry Terminal",
+                "terms": ""
+            },
             "amenity/fire_station": {
                 "name": "Fire Station",
                 "terms": ""
@@ -1754,6 +1758,10 @@
                 "name": "Hospital Grounds",
                 "terms": "clinic,doctor,emergency room,health service,hospice,infirmary,institution,nursing home,sanatorium,sanitarium,sick,surgery,ward"
             },
+            "amenity/hunting_stand": {
+                "name": "Hunting Stand",
+                "terms": ""
+            },
             "amenity/kindergarten": {
                 "name": "Preschool/Kindergarten Grounds",
                 "terms": "kindergarden,pre-school"
@@ -1782,6 +1790,10 @@
                 "name": "Parking Garage Entrance/Exit",
                 "terms": ""
             },
+            "amenity/parking_space": {
+                "name": "Parking Space",
+                "terms": ""
+            },
             "amenity/pharmacy": {
                 "name": "Pharmacy",
                 "terms": "drug,medicine"
@@ -1950,6 +1962,10 @@
                 "name": "Waste Basket",
                 "terms": "bin,rubbish,litter,trash,garbage"
             },
+            "amenity/water_point": {
+                "name": "RV Drinking Water",
+                "terms": ""
+            },
             "area": {
                 "name": "Area",
                 "terms": ""
@@ -3934,6 +3950,10 @@
                 "name": "Waterway",
                 "terms": ""
             },
+            "waterway/boatyard": {
+                "name": "Boatyard",
+                "terms": ""
+            },
             "waterway/canal": {
                 "name": "Canal",
                 "terms": ""
@@ -3946,6 +3966,10 @@
                 "name": "Ditch",
                 "terms": ""
             },
+            "waterway/dock": {
+                "name": "Dock",
+                "terms": ""
+            },
             "waterway/drain": {
                 "name": "Drain",
                 "terms": ""
@@ -3970,6 +3994,10 @@
                 "name": "Stream",
                 "terms": "beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse"
             },
+            "waterway/water_point": {
+                "name": "Marine Drinking Water",
+                "terms": ""
+            },
             "waterway/weir": {
                 "name": "Weir",
                 "terms": ""