Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 8121)
+++ trunk/data/validator/deprecated.mapcss	(revision 8135)
@@ -398,2 +398,9 @@
   suggestAlternative: {1.key};
 }
+
+/* see #11223 */
+*[waterway=wadi] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "{0.key}=* + intermittent=yes";
+  suggestAlternative: "natural=valley";
+}
Index: trunk/data/validator/geometry.mapcss
===================================================================
--- trunk/data/validator/geometry.mapcss	(revision 8121)
+++ trunk/data/validator/geometry.mapcss	(revision 8135)
@@ -30,5 +30,4 @@
 node[waterway=river],
 node[waterway=canal],
-node[waterway=wadi],
 node[waterway=stream],
 node[waterway=ditch],
@@ -36,4 +35,5 @@
 node[natural=coastline],
 node[natural=ridge],
+node[natural=valley],
 node[natural=tree_row] {
   throwWarning: tr("{0} on a node. Should be used on a way.", "{0.tag}");