diff --git a/data/deprecated.json b/data/deprecated.json
index 4b5cf81e3..6644ca349 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -1514,6 +1514,10 @@
     "old": {"unnamed": "*"},
     "replace": {"noname": "$1"}
   },
+  {
+    "old": {"vhf_channel": "*"},
+    "replace": {"vhf": "$1"}
+  },
   {
     "old": {"volcano": "extinct"},
     "replace": {"volcano:status": "extinct"}
@@ -1550,6 +1554,10 @@
     "old": {"waterway": "riverbank"},
     "replace": {"natural": "water", "water": "river"}
   },
+  {
+    "old": {"waterway:vhf_channel": "*"},
+    "replace": {"vhf": "$1"}
+  },
   {
     "old": {"wifi": "yes"},
     "replace": {"internet_access": "wlan"}
diff --git a/data/presets.yaml b/data/presets.yaml
index 1e966d0e6..34f91a879 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2748,6 +2748,11 @@ en:
       vending:
         # vending=*
         label: Types of Goods
+      vhf:
+        # vhf=*
+        label: VHF Channel
+        # 'terms: call sign,very high frequency'
+        terms: '[translate with synonyms or related terms for ''VHF Channel'', separated by commas]'
       video_calls:
         # video=*
         label: Video Calls
@@ -6036,7 +6041,7 @@ en:
       leisure/marina:
         # leisure=marina
         name: Marina
-        # 'terms: boat'
+        # 'terms: boats,docks,harbor,harbour,moorings,yachts'
         terms: '<translate with synonyms or related terms for ''Marina'', separated by commas>'
       leisure/miniature_golf:
         # leisure=miniature_golf
diff --git a/data/presets/fields.json b/data/presets/fields.json
index b7f47224e..c7fc1411e 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -481,6 +481,7 @@
   "utility": {"key": "utility", "type": "typeCombo", "label": "Utility"},
   "valve": {"key": "valve", "type": "combo", "label": "Type"},
   "vending": {"key": "vending", "type": "semiCombo", "label": "Types of Goods"},
+  "vhf": {"key": "vhf", "type": "text", "label": "VHF Channel", "terms": ["call sign", "very high frequency"]},
   "video_calls": {"key": "video", "type": "check", "label": "Video Calls"},
   "visibility": {"key": "visibility", "type": "combo", "label": "Visibility", "strings": {"options": {"house": "Up to 5m (16ft)", "street": "5 to 20m (16 to 65ft)", "area": "Over 20m (65ft)"}}},
   "volcano/status": {"key": "volcano:status", "type": "combo", "label": "Volcano Status", "strings": {"options": {"active": "Active", "dormant": "Dormant", "extinct": "Extinct"}}},
diff --git a/data/presets/fields/vhf.json b/data/presets/fields/vhf.json
new file mode 100644
index 000000000..98d76b14d
--- /dev/null
+++ b/data/presets/fields/vhf.json
@@ -0,0 +1,9 @@
+{
+    "key": "vhf",
+    "type": "text",
+    "label": "VHF Channel",
+    "terms": [
+        "call sign",
+        "very high frequency"
+    ]
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index c9a95fb46..1b31714e1 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -690,7 +690,7 @@
   "leisure/hackerspace": {"icon": "fas-code", "fields": ["name", "address", "building_area", "opening_hours", "opening_hours/covid19", "website", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["makerspace", "hackspace", "hacklab"], "tags": {"leisure": "hackerspace"}, "name": "Hackerspace"},
   "leisure/horse_riding": {"icon": "maki-horse-riding", "fields": ["name", "access_simple", "operator", "address", "building"], "moreFields": ["email", "fax", "gnis/feature_id", "opening_hours", "opening_hours/covid19", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["equestrian", "stable"], "tags": {"leisure": "horse_riding"}, "name": "Horseback Riding Facility"},
   "leisure/ice_rink": {"icon": "fas-skating", "fields": ["name", "seasonal", "sport_ice", "operator", "address", "building"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "opening_hours/covid19", "payment_multi", "phone", "website"], "geometry": ["area", "point"], "terms": ["hockey", "skating", "curling"], "tags": {"leisure": "ice_rink"}, "name": "Ice Rink"},
-  "leisure/marina": {"icon": "tnp-2009223", "fields": ["name", "operator", "capacity", "fee", "payment_multi_fee", "charge_fee", "sanitary_dump_station", "power_supply"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "seamark/type", "website"], "geometry": ["area", "point", "vertex"], "terms": ["boat"], "tags": {"leisure": "marina"}, "name": "Marina"},
+  "leisure/marina": {"icon": "tnp-2009223", "fields": ["name", "operator", "capacity", "fee", "payment_multi_fee", "charge_fee", "sanitary_dump_station", "power_supply"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "seamark/type", "vhf", "website"], "geometry": ["area", "point", "vertex"], "terms": ["boats", "docks", "harbor", "harbour", "moorings", "yachts"], "tags": {"leisure": "marina"}, "addTags": {"leisure": "marina", "seamark:type": "harbour", "seamark:harbour:category": "marina"}, "name": "Marina"},
   "leisure/miniature_golf": {"icon": "temaki-golf_green", "fields": ["name", "operator", "address", "opening_hours", "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["area", "point"], "terms": ["crazy golf", "mini golf", "putt-putt"], "tags": {"leisure": "miniature_golf"}, "name": "Miniature Golf"},
   "leisure/nature_reserve": {"icon": "maki-park", "geometry": ["area", "point"], "fields": ["name", "operator", "address", "opening_hours", "opening_hours/covid19"], "moreFields": ["dog", "email", "fax", "gnis/feature_id", "phone", "website"], "tags": {"leisure": "nature_reserve"}, "terms": ["protected", "wildlife"], "name": "Nature Reserve"},
   "leisure/outdoor_seating": {"icon": "maki-picnic-site", "geometry": ["point", "area"], "fields": ["name", "operator"], "moreFields": ["level"], "terms": ["al fresco", "beer garden", "dining", "cafe", "restaurant", "pub", "bar", "patio"], "tags": {"leisure": "outdoor_seating"}, "name": "Outdoor Seating Area"},
diff --git a/data/presets/presets/leisure/marina.json b/data/presets/presets/leisure/marina.json
index 53aaa51cc..76beeb375 100644
--- a/data/presets/presets/leisure/marina.json
+++ b/data/presets/presets/leisure/marina.json
@@ -20,6 +20,7 @@
         "internet_access/ssid",
         "phone",
         "seamark/type",
+        "vhf",
         "website"
     ],
     "geometry": [
@@ -28,10 +29,20 @@
         "vertex"
     ],
     "terms": [
-        "boat"
+        "boats",
+        "docks",
+        "harbor",
+        "harbour",
+        "moorings",
+        "yachts"
     ],
     "tags": {
         "leisure": "marina"
     },
+    "addTags": {
+        "leisure": "marina",
+        "seamark:type": "harbour",
+        "seamark:harbour:category": "marina"
+    },
     "name": "Marina"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index c74e62e85..6e5636fe9 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1966,6 +1966,7 @@
     {"key": "usage", "value": "tourism", "description": "🄵 Usage Type"},
     {"key": "valve", "description": "🄵 Type"},
     {"key": "vending", "description": "🄵 Types of Goods"},
+    {"key": "vhf", "description": "🄵 VHF Channel"},
     {"key": "video", "description": "🄵 Video Calls"},
     {"key": "visibility", "value": "house", "description": "🄵 Visibility"},
     {"key": "visibility", "value": "street", "description": "🄵 Visibility"},
@@ -2329,6 +2330,7 @@
     {"key": "type", "value": "shield", "description": "🄳 ➜ volcano:type=shield"},
     {"key": "type", "value": "strato", "description": "🄳 ➜ volcano:type=stratovolcano"},
     {"key": "unnamed", "description": "🄳 ➜ noname=*"},
+    {"key": "vhf_channel", "description": "🄳 ➜ vhf=*"},
     {"key": "volcano", "value": "extinct", "description": "🄳 ➜ volcano:status=extinct"},
     {"key": "wall_type", "value": "noise_barrier", "description": "🄳 ➜ wall=noise_barrier"},
     {"key": "water", "value": "intermittent", "description": "🄳 ➜ natural=water + intermittent=yes"},
@@ -2337,6 +2339,7 @@
     {"key": "water", "value": "tidal", "description": "🄳 ➜ natural=water + tidal=yes"},
     {"key": "waterway", "value": "aqueduct", "description": "🄳 ➜ waterway=canal + bridge=aqueduct"},
     {"key": "waterway", "value": "lock", "description": "🄳 ➜ waterway=canal + lock=yes"},
+    {"key": "waterway:vhf_channel", "description": "🄳 ➜ vhf=*"},
     {"key": "wifi", "value": "yes", "description": "🄳 ➜ internet_access=wlan"},
     {"key": "wifi", "value": "free", "description": "🄳 ➜ internet_access=wlan + internet_access:fee=no"},
     {"key": "women", "description": "🄳 ➜ female=*"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 1c95f4142..aa37a8121 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -5025,6 +5025,10 @@
                 "vending": {
                     "label": "Types of Goods"
                 },
+                "vhf": {
+                    "label": "VHF Channel",
+                    "terms": "call sign,very high frequency"
+                },
                 "video_calls": {
                     "label": "Video Calls",
                     "terms": ""
@@ -7858,7 +7862,7 @@
                 },
                 "leisure/marina": {
                     "name": "Marina",
-                    "terms": "boat"
+                    "terms": "boats,docks,harbor,harbour,moorings,yachts"
                 },
                 "leisure/miniature_golf": {
                     "name": "Miniature Golf",