diff --git a/data/deprecated.json b/data/deprecated.json
index 4496618c7..16aec0b2c 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -1081,6 +1081,10 @@
       "old": {"type": "broad_leaved"},
       "replace": {"leaf_type": "broadleaved"}
     },
+    {
+      "old": {"type": "caldera"},
+      "replace": {"volcano:type": "caldera"}
+    },
     {
       "old": {"type": "conifer"},
       "replace": {"leaf_type": "needleleaved"}
@@ -1089,10 +1093,30 @@
       "old": {"type": "deciduous"},
       "replace": {"leaf_cycle": "deciduous"}
     },
+    {
+      "old": {"type": "extinct"},
+      "replace": {"volcano:status": "extinct"}
+    },
+    {
+      "old": {"type": "scoria"},
+      "replace": {"volcano:type": "scoria"}
+    },
+    {
+      "old": {"type": "shield"},
+      "replace": {"volcano:type": "shield"}
+    },
+    {
+      "old": {"type": "strato"},
+      "replace": {"volcano:type": "stratovolcano"}
+    },
     {
       "old": {"unnamed": "*"},
       "replace": {"noname": "$1"}
     },
+    {
+      "old": {"volcano": "extinct"},
+      "replace": {"volcano:status": "extinct"}
+    },
     {
       "old": {"wall_type": "noise_barrier"},
       "replace": {"wall": "noise_barrier"}
diff --git a/data/taginfo.json b/data/taginfo.json
index 057c3451c..955d5cb8c 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2114,9 +2114,15 @@
     {"key": "tower:type", "value": "suspension", "description": "🄳 ➜ line_attachment=suspension"},
     {"key": "townhall:village", "value": "yes", "description": "🄳 ➜ amenity=townhall + townhall:type=village"},
     {"key": "type", "value": "broad_leaved", "description": "🄳 ➜ leaf_type=broadleaved"},
+    {"key": "type", "value": "caldera", "description": "🄳 ➜ volcano:type=caldera"},
     {"key": "type", "value": "conifer", "description": "🄳 ➜ leaf_type=needleleaved"},
     {"key": "type", "value": "deciduous", "description": "🄳 ➜ leaf_cycle=deciduous"},
+    {"key": "type", "value": "extinct", "description": "🄳 ➜ volcano:status=extinct"},
+    {"key": "type", "value": "scoria", "description": "🄳 ➜ volcano:type=scoria"},
+    {"key": "type", "value": "shield", "description": "🄳 ➜ volcano:type=shield"},
+    {"key": "type", "value": "strato", "description": "🄳 ➜ volcano:type=stratovolcano"},
     {"key": "unnamed", "description": "🄳 ➜ noname=*"},
+    {"key": "volcano", "value": "extinct", "description": "🄳 ➜ volcano:status=extinct"},
     {"key": "wall_type", "value": "noise_barrier", "description": "🄳 ➜ wall=noise_barrier"},
     {"key": "water", "value": "intermittent", "description": "🄳 ➜ natural=water + intermittent=yes"},
     {"key": "water", "value": "riverbank", "description": "🄳 ➜ natural=water + water=river"},