diff --git a/data/presets.yaml b/data/presets.yaml
index 05e58f842..d58bda4c1 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -5691,6 +5691,10 @@ en:
         name: Shipwreck
         # 'terms: hull,mast,maritime,remains,ship,boat'
         terms: '<translate with synonyms or related terms for ''Shipwreck'', separated by commas>'
+      hot_spring:
+        # natural=hot_spring
+        name: Hot Spring
+        terms: '<translate with synonyms or related terms for ''Hot Spring'', separated by commas>'
       indoor:
         # indoor=*
         name: Indoor Feature
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 5b44b3571..2c31eaffe 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -607,6 +607,7 @@
   "historic/wayside_cross": {"icon": "maki-religious-christian", "fields": ["name", "inscription", "material"], "moreFields": ["{historic}", "start_date", "religion", "denomination"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_cross"}, "name": "Wayside Cross"},
   "historic/wayside_shrine": {"icon": "maki-landmark", "fields": ["name", "religion", "denomination", "inscription", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_shrine"}, "name": "Wayside Shrine"},
   "historic/wreck": {"icon": "temaki-ruins", "fields": ["name", "access_simple", "seamark/wreck/category", "historic/wreck/date_sunk", "historic/wreck/visible_at_low_tide", "historic/wreck/visible_at_high_tide"], "moreFields": ["{historic}", "seamark/type"], "geometry": ["point", "area"], "tags": {"historic": "wreck"}, "addTags": {"historic": "wreck", "seamark:type": "wreck"}, "terms": ["hull", "mast", "maritime", "remains", "ship", "boat"], "name": "Shipwreck"},
+  "hot_spring": {"icon": "maki-water", "fields": ["name", "water", "hot_water", "intermittent"], "moreFields": ["fishing", "gnis/feature_id", "salt", "tidal"], "geometry": ["area"], "tags": {"natural": "hot_spring"}, "name": "Hot Spring"},
   "indoor/corridor_line": {"fields": ["level", "name"], "geometry": ["line"], "tags": {"indoor": "corridor"}, "searchable": false, "matchScore": 1.1, "name": "Indoor Corridor", "replacement": "highway/corridor"},
   "indoor/area": {"fields": ["level", "name", "ref_room_number", "height"], "geometry": ["area"], "tags": {"indoor": "area"}, "terms": ["indoor space"], "matchScore": 0.8, "name": "Indoor Area"},
   "indoor/corridor": {"icon": "temaki-pedestrian", "fields": ["level", "name", "ref", "height"], "geometry": ["area"], "tags": {"indoor": "corridor"}, "terms": ["concourse", "foyer", "hallway", "passageway"], "matchScore": 0.8, "name": "Indoor Corridor"},
diff --git a/data/presets/presets/hot_spring.json b/data/presets/presets/hot_spring.json
new file mode 100644
index 000000000..450420c5a
--- /dev/null
+++ b/data/presets/presets/hot_spring.json
@@ -0,0 +1,23 @@
+{
+    "icon": "maki-water",
+    "fields": [
+        "name",
+        "water",
+        "hot_water",
+        "intermittent"
+    ],
+    "moreFields": [
+        "fishing",
+        "gnis/feature_id",
+        "salt",
+        "tidal"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "natural": "hot_spring"
+    },
+    "name": "Hot Spring"
+}
+
diff --git a/data/taginfo.json b/data/taginfo.json
index 74eb45624..3ef27952d 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -590,6 +590,7 @@
     {"key": "historic", "value": "wayside_cross", "description": "🄿 Wayside Cross", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-christian-15.svg"},
     {"key": "historic", "value": "wayside_shrine", "description": "🄿 Wayside Shrine", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/landmark-15.svg"},
     {"key": "historic", "value": "wreck", "description": "🄿 Shipwreck", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/ruins.svg"},
+    {"key": "natural", "value": "hot_spring", "description": "🄿 Hot Spring", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "indoor", "value": "corridor", "description": "🄿 Indoor Corridor (unsearchable), 🄿 Indoor Corridor", "object_types": ["way"]},
     {"key": "indoor", "value": "area", "description": "🄿 Indoor Area", "object_types": ["area"]},
     {"key": "indoor", "value": "door", "description": "🄿 Indoor Door", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 24e3ff672..79f40d9b4 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -7748,6 +7748,10 @@
                     "name": "Shipwreck",
                     "terms": "hull,mast,maritime,remains,ship,boat"
                 },
+                "hot_spring": {
+                    "name": "Hot Spring",
+                    "terms": ""
+                },
                 "indoor/corridor_line": {
                     "name": "Indoor Corridor"
                 },