diff --git a/data/deprecated.json b/data/deprecated.json
index 1775417088..c22c72da99 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -677,6 +677,14 @@
       "old": {"theatre:type": "amphitheatre"},
       "replace": {"theatre:type": "amphi"}
     },
+    {
+      "old": {"todo": "*"},
+      "replace": {"fixme": "$1"}
+    },
+    {
+      "old": {"TODO": "*"},
+      "replace": {"fixme": "$1"}
+    },
     {
       "old": {"toilets:disposal": "longdrop"},
       "replace": {"toilets:disposal": "pitlatrine"}
diff --git a/data/taginfo.json b/data/taginfo.json
index e69b2e9c0f..4107eaa668 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1848,6 +1848,8 @@
     {"key": "sloped_curb", "value": "no", "description": "🄳 ➜ kerb=raised"},
     {"key": "sloped_curb", "value": "yes", "description": "🄳 ➜ kerb=lowered"},
     {"key": "theatre:type", "value": "amphitheatre", "description": "🄳 ➜ theatre:type=amphi"},
+    {"key": "todo", "description": "🄳 ➜ fixme=*"},
+    {"key": "TODO", "description": "🄳 ➜ fixme=*"},
     {"key": "toilets:disposal", "value": "longdrop", "description": "🄳 ➜ toilets:disposal=pitlatrine"},
     {"key": "toilets:disposal", "value": "pit_latrine", "description": "🄳 ➜ toilets:disposal=pitlatrine"},
     {"key": "tourism", "value": "bed_and_breakfast", "description": "🄳 ➜ tourism=guest_house + guest_house=bed_and_breakfast"},