diff --git a/data/presets.yaml b/data/presets.yaml
index 147dbb6c1..f87b57628 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1034,6 +1034,9 @@ en:
           outdoor: Outdoor
           # location=roof
           roof: Rooftop
+      lock:
+        # lock=*
+        label: Lock
       man_made:
         # man_made=*
         label: Type
@@ -7255,6 +7258,10 @@ en:
         # waterway=canal
         name: Canal
         terms: '<translate with synonyms or related terms for ''Canal'', separated by commas>'
+      waterway/canal/lock:
+        # 'waterway=canal, lock=yes'
+        name: Canal Lock
+        terms: '<translate with synonyms or related terms for ''Canal Lock'', separated by commas>'
       waterway/dam:
         # waterway=dam
         name: Dam
@@ -7277,6 +7284,11 @@ en:
         name: Marine Fuel Station
         # 'terms: petrol,gas,diesel,boat'
         terms: '<translate with synonyms or related terms for ''Marine Fuel Station'', separated by commas>'
+      waterway/lock_gate:
+        # waterway=lock_gate
+        name: Lock Gate
+        # 'terms: canal'
+        terms: '<translate with synonyms or related terms for ''Lock Gate'', separated by commas>'
       waterway/milestone:
         # waterway=milestone
         name: Waterway Milestone
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 179c15ef5..dcff1dcc6 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -200,6 +200,7 @@
     "lit": {"key": "lit", "type": "check", "label": "Lit"},
     "location_pool": {"key": "location", "type": "typeCombo", "label": "Location", "strings": {"options": {"outdoor": "Outdoor", "indoor": "Indoor", "roof": "Rooftop"}}},
     "location": {"key": "location", "type": "combo", "label": "Location"},
+    "lock": {"key": "lock", "type": "check", "label": "Lock"},
     "man_made": {"key": "man_made", "type": "typeCombo", "label": "Type"},
     "manhole": {"key": "manhole", "type": "typeCombo", "label": "Type"},
     "map_size": {"key": "map_size", "type": "typeCombo", "label": "Coverage"},
diff --git a/data/presets/fields/lock.json b/data/presets/fields/lock.json
new file mode 100644
index 000000000..027630402
--- /dev/null
+++ b/data/presets/fields/lock.json
@@ -0,0 +1,5 @@
+{
+    "key": "lock",
+    "type": "check",
+    "label": "Lock"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index d2b7d4f33..98ae70afe 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1112,12 +1112,14 @@
     "type/waterway": {"icon": "iD-waterway-stream", "fields": ["name", "waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"},
     "waterway/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank", "searchable": false},
     "waterway/boatyard": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"},
-    "waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "width", "intermittent"], "moreFields": ["salt"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"},
-    "waterway/dam": {"icon": "maki-dam", "geometry": ["point", "vertex", "line", "area"], "moreFields": ["website"], "fields": ["name"], "tags": {"waterway": "dam"}, "name": "Dam"},
+    "waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "width", "intermittent", "lock"], "moreFields": ["salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"},
+    "waterway/canal/lock": {"icon": "iD-waterway-canal", "fields": ["name", "width", "lock"], "moreFields": ["intermittent", "salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal", "lock": "yes"}, "name": "Canal Lock"},
+    "waterway/dam": {"icon": "maki-dam", "geometry": ["point", "vertex", "line", "area"], "fields": ["name"], "moreFields": ["website"], "tags": {"waterway": "dam"}, "name": "Dam"},
     "waterway/ditch": {"icon": "iD-waterway-ditch", "fields": ["{waterway/drain}"], "moreFields": ["{waterway/drain}"], "geometry": ["line"], "tags": {"waterway": "ditch"}, "name": "Ditch"},
     "waterway/dock": {"icon": "maki-harbor", "fields": ["name", "dock", "operator"], "geometry": ["area", "vertex", "point"], "terms": ["boat", "ship", "vessel", "marine"], "tags": {"waterway": "dock"}, "name": "Wet Dock / Dry Dock"},
     "waterway/drain": {"icon": "iD-waterway-ditch", "fields": ["structure_waterway", "intermittent"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"waterway": "drain"}, "name": "Drain"},
     "waterway/fuel": {"icon": "maki-fuel", "fields": ["name", "operator", "address", "opening_hours", "fuel_multi"], "moreFields": ["payment_multi", "brand", "seamark/type", "building", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "gas", "diesel", "boat"], "tags": {"waterway": "fuel"}, "name": "Marine Fuel Station"},
+    "waterway/lock_gate": {"icon": "maki-dam", "geometry": ["vertex", "line"], "fields": ["name", "ref", "height", "material"], "tags": {"waterway": "lock_gate"}, "addTags": {"waterway": "lock_gate", "seamark:type": "gate"}, "removeTags": {"waterway": "lock_gate", "seamark:type": "gate"}, "terms": ["canal"], "name": "Lock Gate"},
     "waterway/milestone": {"icon": "temaki-milestone", "fields": ["distance", "direction_vertex"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex"], "tags": {"waterway": "milestone"}, "terms": ["milestone", "marker"], "name": "Waterway Milestone"},
     "waterway/river": {"icon": "iD-waterway-river", "fields": ["name", "structure_waterway", "width", "intermittent", "tidal"], "moreFields": ["covered", "salt"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "tags": {"waterway": "river"}, "name": "River"},
     "waterway/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["name", "operator", "access_simple", "fee", "water_point"], "moreFields": ["opening_hours", "payment_multi", "seamark/type"], "geometry": ["point", "vertex", "area"], "terms": ["Boat", "Watercraft", "Sanitary", "Dump Station", "Pumpout", "Pump out", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"waterway": "sanitary_dump_station"}, "name": "Marine Toilet Disposal"},
diff --git a/data/presets/presets/waterway/canal.json b/data/presets/presets/waterway/canal.json
index 8f672521b..451582f76 100644
--- a/data/presets/presets/waterway/canal.json
+++ b/data/presets/presets/waterway/canal.json
@@ -3,10 +3,12 @@
     "fields": [
         "name",
         "width",
-        "intermittent"
+        "intermittent",
+        "lock"
     ],
     "moreFields": [
-        "salt"
+        "salt",
+        "tidal"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/waterway/canal/lock.json b/data/presets/presets/waterway/canal/lock.json
new file mode 100644
index 000000000..6d9aa0d68
--- /dev/null
+++ b/data/presets/presets/waterway/canal/lock.json
@@ -0,0 +1,21 @@
+{
+    "icon": "iD-waterway-canal",
+    "fields": [
+        "name",
+        "width",
+        "lock"
+    ],
+    "moreFields": [
+        "intermittent",
+        "salt",
+        "tidal"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "waterway": "canal",
+        "lock": "yes"
+    },
+    "name": "Canal Lock"
+}
diff --git a/data/presets/presets/waterway/dam.json b/data/presets/presets/waterway/dam.json
index 06ec3f5cc..79dd6e5aa 100644
--- a/data/presets/presets/waterway/dam.json
+++ b/data/presets/presets/waterway/dam.json
@@ -6,12 +6,12 @@
         "line",
         "area"
     ],
-    "moreFields": [
-        "website"
-    ],
     "fields": [
         "name"
     ],
+    "moreFields": [
+        "website"
+    ],
     "tags": {
         "waterway": "dam"
     },
diff --git a/data/presets/presets/waterway/lock_gate.json b/data/presets/presets/waterway/lock_gate.json
new file mode 100644
index 000000000..333000d10
--- /dev/null
+++ b/data/presets/presets/waterway/lock_gate.json
@@ -0,0 +1,28 @@
+{
+    "icon": "maki-dam",
+    "geometry": [
+        "vertex",
+        "line"
+    ],
+    "fields": [
+        "name",
+        "ref",
+        "height",
+        "material"
+    ],
+    "tags": {
+        "waterway": "lock_gate"
+    },
+    "addTags": {
+        "waterway": "lock_gate",
+        "seamark:type": "gate"
+    },
+    "removeTags": {
+        "waterway": "lock_gate",
+        "seamark:type": "gate"
+    },
+    "terms": [
+        "canal"
+    ],
+    "name": "Lock Gate"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 4dd0071f3..60392187b 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1050,11 +1050,13 @@
     {"key": "waterway", "value": "riverbank", "description": "🄿 Riverbank (unsearchable), 🄳 ➜ natural=water + water=river", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/water-15.svg?sanitize=true"},
     {"key": "waterway", "value": "boatyard", "description": "🄿 Boatyard", "object_types": ["area", "node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/harbor-15.svg?sanitize=true"},
     {"key": "waterway", "value": "canal", "description": "🄿 Canal", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-canal.svg?sanitize=true"},
+    {"key": "lock", "value": "yes", "description": "🄿 Canal Lock", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-canal.svg?sanitize=true"},
     {"key": "waterway", "value": "dam", "description": "🄿 Dam", "object_types": ["node", "way", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/dam-15.svg?sanitize=true"},
     {"key": "waterway", "value": "ditch", "description": "🄿 Ditch", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-ditch.svg?sanitize=true"},
     {"key": "waterway", "value": "dock", "description": "🄿 Wet Dock / Dry Dock", "object_types": ["area", "node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/harbor-15.svg?sanitize=true"},
     {"key": "waterway", "value": "drain", "description": "🄿 Drain", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-ditch.svg?sanitize=true"},
     {"key": "waterway", "value": "fuel", "description": "🄿 Marine Fuel Station", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/fuel-15.svg?sanitize=true"},
+    {"key": "waterway", "value": "lock_gate", "description": "🄿 Lock Gate", "object_types": ["node", "way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/dam-15.svg?sanitize=true"},
     {"key": "waterway", "value": "milestone", "description": "🄿 Waterway Milestone", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/milestone.svg?sanitize=true"},
     {"key": "waterway", "value": "river", "description": "🄿 River", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/iD-sprite/presets/waterway-river.svg?sanitize=true"},
     {"key": "waterway", "value": "sanitary_dump_station", "description": "🄿 Marine Toilet Disposal", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/storage_tank.svg?sanitize=true"},
@@ -1375,6 +1377,7 @@
     {"key": "location", "value": "indoor", "description": "🄵 Location"},
     {"key": "location", "value": "roof", "description": "🄵 Location"},
     {"key": "location", "description": "🄵 Location"},
+    {"key": "lock", "description": "🄵 Lock"},
     {"key": "map_size", "description": "🄵 Coverage"},
     {"key": "map_type", "description": "🄵 Type"},
     {"key": "material", "description": "🄵 Material"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index af0441732..7f1513e5d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3091,6 +3091,9 @@
                 "location": {
                     "label": "Location"
                 },
+                "lock": {
+                    "label": "Lock"
+                },
                 "man_made": {
                     "label": "Type"
                 },
@@ -8505,6 +8508,10 @@
                     "name": "Canal",
                     "terms": ""
                 },
+                "waterway/canal/lock": {
+                    "name": "Canal Lock",
+                    "terms": ""
+                },
                 "waterway/dam": {
                     "name": "Dam",
                     "terms": ""
@@ -8525,6 +8532,10 @@
                     "name": "Marine Fuel Station",
                     "terms": "petrol,gas,diesel,boat"
                 },
+                "waterway/lock_gate": {
+                    "name": "Lock Gate",
+                    "terms": "canal"
+                },
                 "waterway/milestone": {
                     "name": "Waterway Milestone",
                     "terms": "milestone,marker"