Index: /trunk/resources/data/defaultpresets.xml
===================================================================
--- /trunk/resources/data/defaultpresets.xml	(revision 18518)
+++ /trunk/resources/data/defaultpresets.xml	(revision 18519)
@@ -2206,5 +2206,5 @@
             <link wiki="Tag:natural=water" />
             <space />
-            <label text="A body of standing water, such as a lake or pond." />
+            <label text="A body of water, such as a lake, pond or river." />
             <space />
             <key key="natural" value="water" />
@@ -2226,5 +2226,5 @@
             </combo>
             <check key="salt" text="Salt Water" disable_off="true" />
-            <check key="intermittent" text="Intermittent (contains not permanently water)" disable_off="true" />
+            <check key="intermittent" text="Intermittent (does not permanently contain water)" disable_off="true" />
             <check key="tidal" text="In the tidal range" disable_off="true" />
             <text key="ele" text="Elevation (meters)" length="10" />
@@ -2240,12 +2240,4 @@
             <text key="name" text="Name" />
         </item> <!-- Coastline -->
-        <item name="Riverbank" icon="presets/nautical/waterway_riverbank.svg" type="closedway,multipolygon" preset_name_label="true">
-            <link wiki="Tag:waterway=riverbank" />
-            <space />
-            <key key="waterway" value="riverbank" />
-            <text key="name" text="Name" />
-            <check key="intermittent" text="Intermittent (contains not permanently water)" disable_off="true" />
-            <check key="tidal" text="In the tidal range" disable_off="true" />
-        </item> <!-- Riverbank -->
         <separator/>
         <item name="Wetland" icon="presets/landuse/wetland.svg" type="closedway,multipolygon" preset_name_label="true">
Index: /trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- /trunk/resources/data/validator/deprecated.mapcss	(revision 18518)
+++ /trunk/resources/data/validator/deprecated.mapcss	(revision 18519)
@@ -2088,4 +2088,37 @@
 }
 
+/* #21630 */
+*[waterway=riverbank][!natural][!water],
+*[waterway=riverbank][natural=water][!water],
+*[waterway=riverbank][!natural][water=river],
+*[waterway=riverbank][natural=water][water=river] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "natural=water + water=river";
+  group: tr("deprecated tagging");
+  fixAdd: "natural=water";
+  fixAdd: "water=river";
+  fixRemove: "waterway";
+  assertMatch: "way waterway=riverbank";
+  assertMatch: "way waterway=riverbank natural=water";
+  assertMatch: "way waterway=riverbank water=river";
+  assertMatch: "way waterway=riverbank natural=water water=river";
+  assertNoMatch: "way waterway=riverbank natural=shingle";
+  assertNoMatch: "way waterway=riverbank water=lake";
+  assertNoMatch: "way waterway=riverbank natural=water water=lake";
+  assertNoMatch: "way waterway=riverbank natural=shingle water=river";
+}
+*[waterway=riverbank][natural][natural!=water],
+*[waterway=riverbank][water][water!=river] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "natural=water + water=river";
+  group: tr("deprecated tagging");
+  assertMatch: "way waterway=riverbank natural=shingle";
+  assertMatch: "way waterway=riverbank water=lake";
+  assertNoMatch: "way waterway=riverbank";
+  assertNoMatch: "way waterway=riverbank natural=water";
+  assertNoMatch: "way waterway=riverbank water=river";
+  assertNoMatch: "way waterway=riverbank natural=water water=river";
+}
+
 node[amenity=bench][capacity][!seats],
 way[amenity=bench][capacity][!seats] {
Index: /trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- /trunk/resources/data/validator/ignoretags.cfg	(revision 18518)
+++ /trunk/resources/data/validator/ignoretags.cfg	(revision 18519)
@@ -690,4 +690,5 @@
 E:exit_to
 K:water=riverbank
+K:waterway=riverbank
 K:stream=intermittent
 K:shop=lamps