diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index e95e350767..041aabe133 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -587,8 +587,8 @@ fee|yes;[fee?];;name;int_name;500;
 fee|no;[fee=no];;name;int_name;501;
 toilets|yes;502;
 highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503;
-deprecated|deprecated;504;x
-deprecated|deprecated;505;x
+drinking_water|yes;504;
+drinking_water|no;505;
 deprecated|deprecated;506;x
 deprecated|deprecated;507;x
 deprecated|deprecated;508;x
diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt
index b19b9ac3c9..7b43a7eeca 100644
--- a/data/replaced_tags.txt
+++ b/data/replaced_tags.txt
@@ -56,8 +56,7 @@ ford=yes : highway=ford
 barrier=jersey_barrier : barrier=block
 barrier=sliding_gate : barrier=gate
 
-drinkable=yes : amenity=drinking_water
-drinking_water=yes : amenity=drinking_water
+drinkable=yes : drinking_water=yes
 water_point=yes : amenity=water_point
 waterway=water_point : amenity=water_point
 sanitary_dump_station=yes : amenity=sanitary_dump_station
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 6fd57898bf..b92a1b0d18 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -410,7 +410,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Synonyms)
     TEST(params.IsTypeExist(GetType({"amenity", "restaurant"})), ());
     TEST(params.IsTypeExist(GetType({"tourism", "hotel"})), ());
     TEST(params.IsTypeExist(GetType({"toilets", "yes"})), ());
-    TEST(params.IsTypeExist(GetType({"amenity", "drinking_water"})), ());
+    TEST(params.IsTypeExist(GetType({"drinking_water", "yes"})), ());
   }
 
   // Duplicating test.
diff --git a/indexer/feature_visibility.cpp b/indexer/feature_visibility.cpp
index c6c503e64e..39399c8e5c 100644
--- a/indexer/feature_visibility.cpp
+++ b/indexer/feature_visibility.cpp
@@ -146,6 +146,7 @@ namespace
       static uint32_t const arrTypes[] = {
         cl.GetTypeByPath({"internet_access"}),
         cl.GetTypeByPath({"toilets"}),
+        cl.GetTypeByPath({"drinking_water"}),
       };
       if (base::IsExist(arrTypes, type))
         return true;