diff --git a/data/presets.yaml b/data/presets.yaml
index 44436bca7..4b4575632 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -909,6 +909,9 @@ en:
       generator/type:
         # 'generator:type=*'
         label: Type
+      geyser/height:
+        # 'geyser:height=*'
+        label: Eruption Height
       gnis/feature_id:
         # 'gnis:feature_id=*'
         label: GNIS Feature ID
@@ -6299,6 +6302,11 @@ en:
         # natural=fell
         name: Fell
         terms: '<translate with synonyms or related terms for ''Fell'', separated by commas>'
+      natural/geyser:
+        # natural=geyser
+        name: Geyser
+        # 'terms: erupting spring,geiser,gieser,guyser,hot water,hydrogeology,hydrothermal explosion,steam'
+        terms: '<translate with synonyms or related terms for ''Geyser'', separated by commas>'
       natural/glacier:
         # natural=glacier
         name: Glacier
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 71a71cdef..44f121765 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -164,6 +164,7 @@
     "generator/output/electricity": {"key": "generator:output:electricity", "type": "typeCombo", "label": "Power Output", "placeholder": "50 MW, 100 MW, 200 MW...", "snake_case": false},
     "generator/source": {"key": "generator:source", "type": "combo", "label": "Source"},
     "generator/type": {"key": "generator:type", "type": "combo", "label": "Type"},
+    "geyser/height": {"key": "geyser:height", "type": "text", "label": "Eruption Height"},
     "gnis/feature_id": {"key": "gnis:feature_id", "type": "identifier", "label": "GNIS Feature ID", "urlFormat": "https://geonames.usgs.gov/apex/f?p=gnispq:3:::NO::P3_FID:{value}", "pattern": "^[0-9]{1,}$", "countryCodes": ["us"], "terms": ["Federal Geographic Names Information Service", "United States Board on Geographic Names", "USA"]},
     "government": {"key": "government", "type": "typeCombo", "label": "Type"},
     "grape_variety": {"key": "grape_variety", "type": "semiCombo", "label": "Grape Varieties"},
diff --git a/data/presets/fields/geyser/height.json b/data/presets/fields/geyser/height.json
new file mode 100644
index 000000000..e5eacbd71
--- /dev/null
+++ b/data/presets/fields/geyser/height.json
@@ -0,0 +1,5 @@
+{
+    "key": "geyser:height",
+    "type": "text",
+    "label": "Eruption Height"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e4af98196..bf580dd68 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -799,6 +799,7 @@
     "natural/cliff": {"icon": "maki-triangle", "fields": ["name", "height"], "geometry": ["point", "vertex", "line", "area"], "tags": {"natural": "cliff"}, "terms": ["crag", "escarpment", "rock face", "scarp"], "name": "Cliff"},
     "natural/coastline": {"icon": "temaki-beach", "geometry": ["line"], "tags": {"natural": "coastline"}, "terms": ["shore"], "name": "Coastline"},
     "natural/fell": {"geometry": ["area"], "tags": {"natural": "fell"}, "terms": [], "name": "Fell"},
+    "natural/geyser": {"icon": "maki-water", "fields": ["name", "geyser/height", "elevation"], "geometry": ["point"], "tags": {"natural": "geyser"}, "terms": ["erupting spring", "geiser", "gieser", "guyser", "hot water", "hydrogeology", "hydrothermal explosion", "steam"], "name": "Geyser"},
     "natural/glacier": {"icon": "temaki-snow", "geometry": ["area"], "tags": {"natural": "glacier"}, "terms": ["ice", "snow"], "name": "Glacier"},
     "natural/grassland": {"icon": "temaki-grass", "geometry": ["area"], "tags": {"natural": "grassland"}, "terms": ["field", "prairie", "savanna"], "name": "Grassland"},
     "natural/heath": {"geometry": ["area"], "tags": {"natural": "heath"}, "terms": [], "name": "Heath"},
diff --git a/data/presets/presets/natural/geyser.json b/data/presets/presets/natural/geyser.json
new file mode 100644
index 000000000..956acd362
--- /dev/null
+++ b/data/presets/presets/natural/geyser.json
@@ -0,0 +1,25 @@
+{
+    "icon": "maki-water",
+    "fields": [
+        "name",
+        "geyser/height",
+        "elevation"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "natural": "geyser"
+    },
+    "terms": [
+        "erupting spring",
+        "geiser",
+        "gieser",
+        "guyser",
+        "hot water",
+        "hydrogeology",
+        "hydrothermal explosion",
+        "steam"
+    ],
+    "name": "Geyser"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index a9aafa0d6..34b27c5cd 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -774,6 +774,7 @@
     {"key": "natural", "value": "cliff", "description": "🄿 Cliff", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/triangle-15.svg"},
     {"key": "natural", "value": "coastline", "description": "🄿 Coastline", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/beach.svg"},
     {"key": "natural", "value": "fell", "description": "🄿 Fell", "object_types": ["area"]},
+    {"key": "natural", "value": "geyser", "description": "🄿 Geyser", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "natural", "value": "glacier", "description": "🄿 Glacier", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/snow.svg"},
     {"key": "natural", "value": "grassland", "description": "🄿 Grassland", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/grass.svg"},
     {"key": "natural", "value": "heath", "description": "🄿 Heath", "object_types": ["area"]},
@@ -1487,6 +1488,7 @@
     {"key": "generator:output:electricity", "description": "🄵 Power Output"},
     {"key": "generator:source", "description": "🄵 Source"},
     {"key": "generator:type", "description": "🄵 Type"},
+    {"key": "geyser:height", "description": "🄵 Eruption Height"},
     {"key": "gnis:feature_id", "description": "🄵 GNIS Feature ID"},
     {"key": "government", "description": "🄵 Type"},
     {"key": "grape_variety", "description": "🄵 Grape Varieties"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index e11e4d815..40023a380 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3353,6 +3353,9 @@
                 "generator/type": {
                     "label": "Type"
                 },
+                "geyser/height": {
+                    "label": "Eruption Height"
+                },
                 "gnis/feature_id": {
                     "label": "GNIS Feature ID",
                     "terms": "Federal Geographic Names Information Service,United States Board on Geographic Names,USA"
@@ -7947,6 +7950,10 @@
                     "name": "Fell",
                     "terms": ""
                 },
+                "natural/geyser": {
+                    "name": "Geyser",
+                    "terms": "erupting spring,geiser,gieser,guyser,hot water,hydrogeology,hydrothermal explosion,steam"
+                },
                 "natural/glacier": {
                     "name": "Glacier",
                     "terms": "ice,snow"