Index: trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- trunk/resources/data/validator/deprecated.mapcss	(revision 16173)
+++ trunk/resources/data/validator/deprecated.mapcss	(revision 16185)
@@ -1955,8 +1955,14 @@
 
 /* #18951 */
-*[water=riverbank] {
-  throwWarning: tr("{0} is deprecated", "{0.tag}");
-  suggestAlternative: "water=river";
+*[water=riverbank][!natural] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "natural=water + water=river";
   group: tr("deprecated tagging");
   fixAdd: "water=river";
-}
+  fixAdd: "natural=water";
+}
+*[water=riverbank][natural] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "natural=water + water=river";
+  group: tr("deprecated tagging");
+}