diff --git a/data/presets.yaml b/data/presets.yaml
index 8094cbee4e..0a17386699 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1434,6 +1434,26 @@ en:
           house: Up to 5m (16ft)
           # visibility=street
           street: 5 to 20m (16 to 65ft)
+      volcano/status:
+        # 'volcano:status=*'
+        label: Volcano Status
+        options:
+          # 'volcano:status=active'
+          active: Active
+          # 'volcano:status=dormant'
+          dormant: Dormant
+          # 'volcano:status=extinct'
+          extinct: Extinct
+      volcano/type:
+        # 'volcano:type=*'
+        label: Volcano Type
+        options:
+          # 'volcano:type=scoria'
+          scoria: Scoria
+          # 'volcano:type=shield'
+          shield: Shield
+          # 'volcano:type=stratovolcano'
+          stratovolcano: Stratovolcano
       wall:
         # wall=*
         label: Type
diff --git a/data/presets/fields.json b/data/presets/fields.json
index b21bad3fe2..fdd38b0ede 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -1952,6 +1952,30 @@
                 }
             }
         },
+        "volcano/status": {
+            "key": "volcano:status",
+            "type": "combo",
+            "label": "Volcano Status",
+            "strings": {
+                "options": {
+                    "active": "Active",
+                    "dormant": "Dormant",
+                    "extinct": "Extinct"
+                }
+            }
+        },
+        "volcano/type": {
+            "key": "volcano:type",
+            "type": "combo",
+            "label": "Volcano Type",
+            "strings": {
+                "options": {
+                    "stratovolcano": "Stratovolcano",
+                    "shield": "Shield",
+                    "scoria": "Scoria"
+                }
+            }
+        },
         "wall": {
             "key": "wall",
             "type": "combo",
diff --git a/data/presets/fields/volcano/status.json b/data/presets/fields/volcano/status.json
new file mode 100644
index 0000000000..7ca3aa4a53
--- /dev/null
+++ b/data/presets/fields/volcano/status.json
@@ -0,0 +1,12 @@
+{
+    "key": "volcano:status",
+    "type": "combo",
+    "label": "Volcano Status",
+    "strings": {
+        "options": {
+            "active": "Active",
+            "dormant": "Dormant",
+            "extinct": "Extinct"
+        }
+    }
+}
diff --git a/data/presets/fields/volcano/type.json b/data/presets/fields/volcano/type.json
new file mode 100644
index 0000000000..2738b630ff
--- /dev/null
+++ b/data/presets/fields/volcano/type.json
@@ -0,0 +1,12 @@
+{
+    "key": "volcano:type",
+    "type": "combo",
+    "label": "Volcano Type",
+    "strings": {
+        "options": {
+            "stratovolcano": "Stratovolcano",
+            "shield": "Shield",
+            "scoria": "Scoria"
+        }
+    }
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4112036f72..fa8cddbd62 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -10592,7 +10592,9 @@
             "icon": "volcano",
             "fields": [
                 "name",
-                "elevation"
+                "elevation",
+                "volcano/status",
+                "volcano/type"
             ],
             "geometry": [
                 "point",
diff --git a/data/presets/presets/natural/volcano.json b/data/presets/presets/natural/volcano.json
index f457970cf1..488f6732c6 100644
--- a/data/presets/presets/natural/volcano.json
+++ b/data/presets/presets/natural/volcano.json
@@ -2,7 +2,9 @@
     "icon": "volcano",
     "fields": [
         "name",
-        "elevation"
+        "elevation",
+        "volcano/status",
+        "volcano/type"
     ],
     "geometry": [
         "point",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 7ab479fdd1..b3033a55e6 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2290,6 +2290,22 @@
                         "area": "Over 20m (65ft)"
                     }
                 },
+                "volcano/status": {
+                    "label": "Volcano Status",
+                    "options": {
+                        "active": "Active",
+                        "dormant": "Dormant",
+                        "extinct": "Extinct"
+                    }
+                },
+                "volcano/type": {
+                    "label": "Volcano Type",
+                    "options": {
+                        "stratovolcano": "Stratovolcano",
+                        "shield": "Shield",
+                        "scoria": "Scoria"
+                    }
+                },
                 "wall": {
                     "label": "Type"
                 },