Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 5594)
+++ trunk/data/defaultpresets.xml	(revision 5595)
@@ -5865,5 +5865,6 @@
             </optional>
             <roles>
-                <role key="main_stream" text="waterways (no riverbank)" requisite="required" type="way" />
+                <role key="" text="waterways (no riverbank)" requisite="optional" type="way" />
+                <role key="main_stream" text="waterways (no riverbank)" requisite="optional" type="way" />
                 <role key="side_stream" text="branch waterways (no riverbank)" requisite="optional" type="way" />
                 <role key="spring" text="spring of waterway" requisite="optional" type="node" />