diff --git a/data/classificator.txt b/data/classificator.txt
index 6b9438277b..a57a29da9d 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -444,6 +444,7 @@ world  +
             {}
         survey_point  -
         wastewater_plant  -
+        water_tower  -
         windmill  -
         {}
     mapswithme  +
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 603f615b29..54acf169cd 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 431801c501..17f5ce0827 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -38981,6 +38981,44 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-water_tower"
+  element {
+    scale: 15
+    symbol {
+      name: "hunting_closed_high"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "hunting_closed_high"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hunting_closed_high"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "hunting_closed_high"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hunting_closed_high"
+      priority: 16000
+    }
+  }
+}
 cont {
   name: "man_made-windmill"
   element {
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index d28c9734d2..de34f8f784 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1048,3 +1048,4 @@ amenity|place_of_worship|hindu;[amenity=place_of_worship][religion=hindu];;name;
 amenity|place_of_worship|shinto;[amenity=place_of_worship][religion=shinto];;name;int_name;1048;
 amenity|place_of_worship|jewish;[amenity=place_of_worship][religion=jewish];;name;int_name;1049;
 amenity|place_of_worship|taoist;[amenity=place_of_worship][religion=taoist];;name;int_name;1050;
+man_made|water_tower;[man_made=water_tower];;name;int_name;1051;
diff --git a/data/styles/legacy/include/base_other.mapcss b/data/styles/legacy/include/base_other.mapcss
index 6d5efc1b9b..d9584b5417 100644
--- a/data/styles/legacy/include/base_other.mapcss
+++ b/data/styles/legacy/include/base_other.mapcss
@@ -646,6 +646,8 @@ node|z16-[historic=battlefield]
 {
   icon-image: cannon.svg;
 }
+area|z15-[man_made=water_tower],
+node|z15-[man_made=water_tower],
 area|z16-[amenity=hunting_stand],
 node|z16-[amenity=hunting_stand]
 {
diff --git a/data/types.txt b/data/types.txt
index 71d9de1ec4..fc88161845 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1048,3 +1048,4 @@ amenity|place_of_worship|hindu
 amenity|place_of_worship|shinto
 amenity|place_of_worship|jewish
 amenity|place_of_worship|taoist
+man_made|water_tower
diff --git a/data/visibility.txt b/data/visibility.txt
index 442a67b403..f0afeb6e05 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -444,6 +444,7 @@ world  00000000000000000000  +
             {}
         survey_point  00000000000000000000  -
         wastewater_plant  00000000000011111111  -
+        water_tower  00000000000000011111  -
         windmill  00000000000000000111  -
         {}
     mapswithme  00000000000000000000  +