diff --git a/data/fields/mooring.json b/data/fields/mooring.json
new file mode 100644
index 00000000..7b4d4a1f
--- /dev/null
+++ b/data/fields/mooring.json
@@ -0,0 +1,14 @@
+{
+    "key": "mooring",
+    "type": "combo",
+    "label": "Mooring",
+    "strings": {
+        "options": {
+            "yes": "Yes",
+            "no": "No",
+            "private": "Private",
+            "commercial": "Commercial",
+            "guest": "Guests"
+        }
+    }
+}
diff --git a/data/presets/man_made/pier.json b/data/presets/man_made/pier.json
index 2138b0ae..df6b0ce9 100644
--- a/data/presets/man_made/pier.json
+++ b/data/presets/man_made/pier.json
@@ -2,6 +2,7 @@
     "icon": "temaki-pier_fixed",
     "fields": [
         "name",
+        "mooring",
         "surface",
         "floating",
         "width",
@@ -25,7 +26,6 @@
         "jetty",
         "landing",
         "promenade",
-        "quay",
         "wharf"
     ],
     "tags": {
diff --git a/data/presets/man_made/quay.json b/data/presets/man_made/quay.json
new file mode 100644
index 00000000..e6d9d69d
--- /dev/null
+++ b/data/presets/man_made/quay.json
@@ -0,0 +1,19 @@
+{
+    "icon": "temaki-quay",
+    "fields": [
+        "name",
+        "mooring"
+    ],
+    "geometry": [
+        "line",
+        "area"
+    ],
+    "terms": [
+        "dock",
+        "wharf"
+    ],
+    "tags": {
+        "man_made": "quay"
+    },
+    "name": "Quay"
+}
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index de610e21..949809ae 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -2881,6 +2881,20 @@ en:
       monitoring_multi:
         # monitoring:=*
         label: Monitoring
+      mooring:
+        # mooring=*
+        label: Mooring
+        options:
+          # mooring=commercial
+          commercial: Commercial
+          # mooring=guest
+          guest: Guests
+          # mooring=no
+          'no': 'No'
+          # mooring=private
+          private: Private
+          # mooring=yes
+          'yes': 'Yes'
       mtb/scale:
         # mtb:scale=*
         label: Mountain Biking Difficulty
@@ -9545,7 +9559,7 @@ en:
       man_made/pier:
         # man_made=pier | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Pier
-        # 'terms: berth,dock,jetty,landing,promenade,quay,wharf'
+        # 'terms: berth,dock,jetty,landing,promenade,wharf'
         terms: <translate with synonyms or related terms for 'Pier', separated by commas>
       man_made/pier/floating:
         # man_made=pier + floating=yes | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
@@ -9570,6 +9584,11 @@ en:
         # man_made=pumping_station | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Pumping Station
         terms: <translate with synonyms or related terms for 'Pumping Station', separated by commas>
+      man_made/quay:
+        # man_made=quay | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Quay
+        # 'terms: dock,wharf'
+        terms: <translate with synonyms or related terms for 'Quay', separated by commas>
       man_made/reservoir_covered:
         # man_made=reservoir_covered | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Covered Reservoir