diff --git a/data/presets.yaml b/data/presets.yaml
index 765973f83..0528b02b2 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -4987,8 +4987,13 @@ en:
       man_made/pier:
         # man_made=pier
         name: Pier
-        # 'terms: dock,jetty'
+        # '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'
+        name: Floating Pier
+        # 'terms: berth,dock,jetty,landing,promenade,wharf'
+        terms: '<translate with synonyms or related terms for ''Floating Pier'', separated by commas>'
       man_made/pipeline:
         # man_made=pipeline
         name: Pipeline
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 9a402534a..428ac54d0 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -632,7 +632,8 @@
     "man_made/monitoring_station": {"icon": "temaki-antenna", "geometry": ["point", "vertex", "area"], "fields": ["monitoring_multi", "operator"], "terms": ["weather", "earthquake", "seismology", "air", "gps"], "tags": {"man_made": "monitoring_station"}, "name": "Monitoring Station"},
     "man_made/observatory": {"fields": ["name", "operator", "address", "access_simple", "building_area"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
     "man_made/petroleum_well": {"icon": "temaki-storage_tank", "geometry": ["point"], "terms": ["drilling rig", "oil derrick", "oil drill", "oil horse", "oil rig", "oil pump", "petroleum well", "pumpjack"], "tags": {"man_made": "petroleum_well"}, "name": "Oil Well"},
-    "man_made/pier": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "floating", "width", "access", "lit"], "moreFields": ["incline", "{highway/footway}"], "geometry": ["line", "area"], "terms": ["dock", "jetty"], "tags": {"man_made": "pier"}, "addTags": {"highway": "footway", "man_made": "pier"}, "removeTags": {"highway": "footway", "man_made": "pier"}, "name": "Pier"},
+    "man_made/pier": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "floating", "width", "access", "lit"], "moreFields": ["incline", "{highway/footway}"], "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier"}, "addTags": {"highway": "footway", "man_made": "pier"}, "removeTags": {"highway": "footway", "man_made": "pier"}, "name": "Pier"},
+    "man_made/pier/floating": {"icon": "temaki-pedestrian", "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier", "floating": "yes"}, "addTags": {"highway": "footway", "man_made": "pier", "floating": "yes"}, "removeTags": {"highway": "footway", "man_made": "pier", "floating": "yes"}, "name": "Floating Pier"},
     "man_made/pipeline": {"icon": "iD-pipeline-line", "fields": ["location", "operator", "substance", "layer"], "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline"}, "name": "Pipeline"},
     "man_made/pumping_station": {"icon": "maki-water", "geometry": ["point", "area"], "tags": {"man_made": "pumping_station"}, "name": "Pumping Station"},
     "man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"},
diff --git a/data/presets/presets/man_made/pier.json b/data/presets/presets/man_made/pier.json
index 05712c648..5b0b3bc0d 100644
--- a/data/presets/presets/man_made/pier.json
+++ b/data/presets/presets/man_made/pier.json
@@ -17,8 +17,12 @@
         "area"
     ],
     "terms": [
+        "berth",
         "dock",
-        "jetty"
+        "jetty",
+        "landing",
+        "promenade",
+        "wharf"
     ],
     "tags": {
         "man_made": "pier"
diff --git a/data/presets/presets/man_made/pier/floating.json b/data/presets/presets/man_made/pier/floating.json
new file mode 100644
index 000000000..c3ecd374f
--- /dev/null
+++ b/data/presets/presets/man_made/pier/floating.json
@@ -0,0 +1,30 @@
+{
+    "icon": "temaki-pedestrian",
+    "geometry": [
+        "line",
+        "area"
+    ],
+    "terms": [
+        "berth",
+        "dock",
+        "jetty",
+        "landing",
+        "promenade",
+        "wharf"
+    ],
+    "tags": {
+        "man_made": "pier",
+        "floating": "yes"
+    },
+    "addTags": {
+        "highway": "footway",
+        "man_made": "pier",
+        "floating": "yes"
+    },
+    "removeTags": {
+        "highway": "footway",
+        "man_made": "pier",
+        "floating": "yes"
+    },
+    "name": "Floating Pier"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index be0904dac..0c790f683 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -613,6 +613,7 @@
     {"key": "man_made", "value": "observatory", "description": "🄿 Observatory", "object_types": ["node", "area"]},
     {"key": "man_made", "value": "petroleum_well", "description": "🄿 Oil Well", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/storage_tank.svg?sanitize=true"},
     {"key": "man_made", "value": "pier", "description": "🄿 Pier", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"},
+    {"key": "floating", "value": "yes", "description": "🄿 Floating Pier", "object_types": ["way", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"},
     {"key": "man_made", "value": "pipeline", "description": "🄿 Pipeline", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/pipeline-line.svg?sanitize=true"},
     {"key": "man_made", "value": "pumping_station", "description": "🄿 Pumping Station", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"},
     {"key": "man_made", "value": "silo", "description": "🄿 Silo", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/silo.svg?sanitize=true"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 4fc36816f..0d912c50a 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -6431,7 +6431,11 @@
                 },
                 "man_made/pier": {
                     "name": "Pier",
-                    "terms": "dock,jetty"
+                    "terms": "berth,dock,jetty,landing,promenade,wharf"
+                },
+                "man_made/pier/floating": {
+                    "name": "Floating Pier",
+                    "terms": "berth,dock,jetty,landing,promenade,wharf"
                 },
                 "man_made/pipeline": {
                     "name": "Pipeline",