diff --git a/data/categories.txt b/data/categories.txt
index d97e50193e..79915a48db 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -9237,7 +9237,7 @@ zh-Hans:水
 zh-Hant:水
 mr:पाणी
 
-amenity-drinking_water|@water
+amenity-drinking_water|drinking_water-yes|@water
 en:4Drinking Water|3Potable Water|U+1F6B0
 ru:3Питьевая вода
 be:3Пітная вада
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 86ec89d3a5..31682b1902 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -1890,6 +1890,9 @@
     zh-Hans = 饮用水
     zh-Hant = 飲用水
 
+  [type.drinking_water.yes]
+    ref = type.amenity.drinking_water
+
   [type.amenity.driving_school]
     en = Driving School
     af = Ryskool