diff --git a/data/deprecated.json b/data/deprecated.json
index 666dd7f16..d8358a033 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -296,6 +296,10 @@
       "old": {"fenced": "yes"},
       "replace": {"barrier": "fence"}
     },
+    {
+      "old": {"FIXME": "*"},
+      "replace": {"fixme": "$1"}
+    },
     {
       "old": {"footway": "both"},
       "replace": {"sidewalk": "both"}
diff --git a/data/taginfo.json b/data/taginfo.json
index 52f4cf086..a9b6be202 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1822,6 +1822,7 @@
     {"key": "fee", "value": "some", "description": "🄳 ➜ fee=yes"},
     {"key": "fee", "value": "Yes", "description": "🄳 ➜ fee=yes"},
     {"key": "fenced", "value": "yes", "description": "🄳 ➜ barrier=fence"},
+    {"key": "FIXME", "description": "🄳 ➜ fixme=*"},
     {"key": "footway", "value": "both", "description": "🄳 ➜ sidewalk=both"},
     {"key": "footway", "value": "left", "description": "🄳 ➜ sidewalk=left"},
     {"key": "footway", "value": "no", "description": "🄳 ➜ sidewalk=no"},