Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 10537)
+++ trunk/data/validator/combinations.mapcss	(revision 10538)
@@ -392,2 +392,11 @@
   fixAdd: "unisex=yes";
 }
+
+/* #13138 */
+area:closed[water][natural!=water][water!=intermittent] { /* water=intermittent is deprecated and has an own warning */
+  throwWarning: tr("{0} without {1}", "{1.key}", "{2.tag}");
+  fixAdd: "natural=water";
+}
+way!:closed[water][natural!=water][water!=intermittent] {
+  throwWarning: tr("{0} without {1}", "{1.key}", "{2.tag}");
+}
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 10537)
+++ trunk/data/validator/deprecated.mapcss	(revision 10538)
@@ -1,4 +1,5 @@
 *[barrier=wire_fence] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "barrier=fence + fence_type=chain_link";
   fixAdd: "barrier=fence";
   fixAdd: "fence_type=chain_link";
@@ -869,2 +870,11 @@
   fixRemove: "tower";
 }
+
+/* #13138 */
+area[landuse=pond] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "natural=water + water=pond";
+  fixAdd: "natural=water";
+  fixAdd: "water=pond";
+  fixRemove: "landuse";
+}