Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 7736)
+++ /trunk/data/validator/deprecated.mapcss	(revision 7737)
@@ -344,2 +344,13 @@
   throwWarning: tr("{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or ''both''.", "{0.key}", "{0.value}");
 }
+
+*[waterway=water_point],
+*[waterway=waste_disposal] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  fixChangeKey: "waterway => amenity";
+}
+*[waterway=mooring] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  fixRemove: "waterway";
+  fixAdd: "mooring=yes";
+}
Index: /trunk/data/validator/geometry.mapcss
===================================================================
--- /trunk/data/validator/geometry.mapcss	(revision 7736)
+++ /trunk/data/validator/geometry.mapcss	(revision 7737)
@@ -3,4 +3,10 @@
 node[bridge?],
 node[sidewalk],
+node[waterway=river],
+node[waterway=riverbank],
+node[waterway=canal],
+node[waterway=wadi],
+node[waterway=stream],
+node[waterway=ditch],
 node[natural=coastline],
 node[natural=ridge],
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 7736)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 7737)
@@ -2245,4 +2245,5 @@
 }
 area[amenity=drinking_water],
+area[amenity=water_point],
 area[amenity=fountain] {
     fill-color: light_water#00005f;
@@ -2250,4 +2251,9 @@
 node[amenity=drinking_water] {
     icon-image: "food/drinking_water.png";
+    set icon_z17;
+    text: auto;
+}
+node[amenity=water_point] {
+    icon-image: "accommodation/camping/water.png";
     set icon_z17;
     text: auto;
@@ -3917,15 +3923,12 @@
     text: auto;
 }
-node[waterway=water_point] {
-    icon-image: "accommodation/camping/water.png";
-    set icon_z17;
-    text: auto;
-}
-node[waterway=waste_disposal] {
-    icon-image: "accommodation/camping/wastewater.png";
-    set icon_z17;
-    text: auto;
-}
+node[waterway=water_point],
+node[waterway=waste_disposal],
 node[waterway=mooring] {
+    icon-image: "misc/deprecated.png";
+    set icon_z17;
+    text: auto;
+}
+node[mooring] {
     icon-image: "nautical/marina.png";
     set icon_z17;