diff --git a/data/editor.config b/data/editor.config
index d59a9b02a4..2abb93a945 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -447,6 +447,9 @@
       <type id="natural-geyser">
         <include field="name" />
       </type>
+      <type id="natural-hot_spring">
+        <include field="name" />
+      </type>
       <type id="natural-peak" can_add="no">
         <include field="name" />
         <include field="wikipedia" />
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 6a31d71c86..8ef9ce22cb 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1322,3 +1322,4 @@ cuisine|fine_dining;1321;
 cuisine|tea;1322;
 natural|geyser;1323;
 sponsored|promo_catalog;1324;
+natural|hot_spring;1325;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 36527ea4d0..4c93ee0f61 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -12388,6 +12388,10 @@
   [type.natural.heath]
     en = Heath
 
+  [type.natural.hot_spring]
+    en = Hot Spring
+    ru = Горячий Источник
+
   [type.natural.lake]
     en = Lake
     ru = Озеро
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 4d3fc32b2b..c76a16b8d5 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -43,6 +43,8 @@ area[amenity=fountain]
 {z-index: 2000;}
 node[natural=spring],
 area[natural=spring],
+node[natural=hot_spring],
+area[natural=hot_spring],
 node[natural=geyser],
 area[natural=geyser],
 node[amenity=drinking_water],
@@ -648,6 +650,8 @@ node|z13-[natural=peak],
 area|z13-[natural=peak],
 node|z14-[natural=spring],
 area|z14-[natural=spring],
+node|z14-[natural=hot_spring],
+area|z14-[natural=hot_spring],
 node|z14-[natural=geyser],
 area|z14-[natural=geyser],
 node|z16-[natural=beach],
@@ -779,10 +783,14 @@ area|z16-[landuse=forest]
 {fill-color: @forest;icon-image: nparkf-m.svg;text-offset: 1;font-size: 12;text-halo-opacity: 0.9;}
 
 node|z14[natural=spring],
-area|z14[natural=spring]
+area|z14[natural=spring],
+node|z14[natural=hot_spring],
+area|z14[natural=hot_spring]
 {icon-image: drinking-water-s.svg;text-offset:6;font-size: 10;icon-min-distance: 24;text-optional: true;}
 node|z15-[natural=spring],
-area|z15-[natural=spring]
+area|z15-[natural=spring],
+node|z15-[natural=hot_spring],
+area|z15-[natural=hot_spring]
 {icon-image: drinking-water-m.svg;text-offset:8;font-size: 10;icon-min-distance: 24;text-optional: true;}
 
 node|z14[natural=geyser],
diff --git a/data/ugc_types.csv b/data/ugc_types.csv
index e7b6fb42ae..2a3c7432c9 100644
--- a/data/ugc_types.csv
+++ b/data/ugc_types.csv
@@ -71,6 +71,7 @@ man_made-lighthouse,1,1,0,experience value_for_money
 natural-beach,1,1,0,experience cleanliness crowdedness
 natural-cave_entrance,1,1,0,experience cleanliness crowdedness
 natural-geyser,1,1,0,rating
+natural-hot_spring,1,1,0,rating
 natural-peak,1,1,0,rating
 natural-spring,1,1,0,rating
 natural-volcano,1,1,0,rating