Index: trunk/data/validator/geometry.mapcss
===================================================================
--- trunk/data/validator/geometry.mapcss	(revision 10422)
+++ trunk/data/validator/geometry.mapcss	(revision 10427)
@@ -269,6 +269,6 @@
 }
 
-/* #12646 */
-way[waterway][waterway!=canal][waterway!=dam]!:closed >[index=-1] node!:connection:in-downloaded-area { 
+/* #12646, #12992 */
+way[waterway=~/^(stream|ditch|river|drain)$/]!:closed >[index=-1] node!:connection:in-downloaded-area { 
   throwWarning: tr("Waterway ends without a connection to another waterway or the direction of the waterway is wrong.");
 }