Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 8143)
+++ /trunk/data/defaultpresets.xml	(revision 8144)
@@ -1704,4 +1704,6 @@
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
             <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
+            <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" />
+            <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" />
         </item> <!-- Stream -->
         <item name="Canal" icon="presets/waterway.png" type="way" preset_name_label="true">
@@ -1717,4 +1719,6 @@
             <reference ref="name_wikipedia" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+            <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" />
+            <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" />
         </item> <!-- Canal -->
         <item name="River" icon="presets/river.png" type="way" preset_name_label="true">
@@ -1733,4 +1737,6 @@
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
             <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
+            <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" />
+            <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" />
         </item> <!-- River -->
         <separator/>
@@ -1863,4 +1869,6 @@
             <check key="salt" text="Salt Water" disable_off="true" />
             <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
+            <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" />
+            <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" />
         </item> <!-- Water -->
         <item name="Coastline" icon="presets/coastline.png" type="way,closedway,relation" preset_name_label="true">