diff --git a/data/classificator.txt b/data/classificator.txt
index 2514f3a797..8f49cf3a6c 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -618,6 +618,7 @@ world  +
         glacier  -
         grassland  -
         heath  -
+        hot_spring  -
         lake  -
         land  -
         meadow  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 1b6d91d272..1ce02ff57c 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 22c1775824..5df5465e2d 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -39072,6 +39072,111 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-hot_spring"
+  element {
+    scale: 14
+    symbol {
+      name: "drinking-water-s"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "drinking-water-m"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "drinking-water-m"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "drinking-water-m"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "drinking-water-m"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "drinking-water-m"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+}
 cont {
   name: "natural-lake"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index cd6220ee6f..5d3e57369c 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 994d0becd3..e1dceba62b 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -38760,6 +38760,111 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-hot_spring"
+  element {
+    scale: 14
+    symbol {
+      name: "drinking-water-s"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "drinking-water-m"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "drinking-water-m"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "drinking-water-m"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "drinking-water-m"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "drinking-water-m"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+}
 cont {
   name: "natural-lake"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 1d1ae158b8..b60a5bf872 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index ccf3c74236..7495b28340 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -38882,6 +38882,111 @@ cont {
     }
   }
 }
+cont {
+  name: "natural-hot_spring"
+  element {
+    scale: 14
+    symbol {
+      name: "drinking-water-s"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 6
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "drinking-water-m"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "drinking-water-m"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "drinking-water-m"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "drinking-water-m"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "drinking-water-m"
+      priority: 16436
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+        is_optional: true
+      }
+      priority: 15436
+    }
+  }
+}
 cont {
   name: "natural-lake"
   element {
diff --git a/data/types.txt b/data/types.txt
index af84cacf60..3c28392aa9 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1322,3 +1322,4 @@ cuisine|fine_dining
 cuisine|tea
 natural|geyser
 sponsored|promo_catalog
+natural|hot_spring
diff --git a/data/visibility.txt b/data/visibility.txt
index e7ff2aed7f..2ff3039774 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -618,6 +618,7 @@ world  00000000000000000000  +
         glacier  11111111111111111111  -
         grassland  00000000000000111111  -
         heath  00000000000000111111  -
+        hot_spring  00000000000000000000  -
         lake  11111111111111111111  -
         land  11111111111111111111  -
         meadow  00000000000000000000  -