diff --git a/data/deprecated.json b/data/deprecated.json
index bbf930fdc..d5039b468 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -607,6 +607,10 @@
       "old": {"waterway": "aqueduct"},
       "replace": {"waterway": "canal", "bridge": "aqueduct"}
     },
+    {
+      "old": {"waterway": "lock"},
+      "replace": {"waterway": "canal", "lock": "yes"}
+    },
     {
       "old": {"waterway": "riverbank"},
       "replace": {"natural": "water", "water": "river"}
diff --git a/data/taginfo.json b/data/taginfo.json
index 60392187b..9f997bd72 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1808,6 +1808,7 @@
     {"key": "water", "value": "salt", "description": "🄳 ➜ natural=water + salt=yes"},
     {"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": "wood", "value": "coniferous", "description": "🄳 ➜ leaf_type=needleleaved"},
     {"key": "wood", "value": "deciduous", "description": "🄳 ➜ leaf_cycle=deciduous"},
     {"key": "wood", "value": "evergreen", "description": "🄳 ➜ leaf_cycle=evergreen"},