Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 8983)
+++ trunk/data/validator/combinations.mapcss	(revision 9003)
@@ -133,6 +133,5 @@
 /* {0.key} without {1.key} or {2.tag} */
 *[smoothness                   ][!highway][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/],
-*[segregated                   ][!highway][railway!=crossing],
-*[boat                         ][!waterway][natural!=water] {
+*[segregated                   ][!highway][railway!=crossing] {
   throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.key}", "{2.tag}");
 }
@@ -150,5 +149,6 @@
 
 /* {0.key} without {1.key}, {2.tag} or {3.tag} */
-*[intermittent                 ][!waterway][natural!~/^(water|spring)$/][ford!=yes] {
+*[intermittent                 ][!waterway][natural!~/^(water|spring)$/][ford!=yes],
+*[boat                         ][!waterway][natural!=water][landuse!=basin] {
   throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.key}", "{2.tag}", "{3.tag}");
 }