Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml	(revision 8339)
+++ data/defaultpresets.xml	(working copy)
@@ -3299,6 +3299,24 @@
             <space />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Camping Site -->
+        <item name="Sanitary Dump Station" icon="styles/standard/service/recycling/sanitary_dump_station.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Toilet_Holding_Tank_Disposal"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Toilet_Holding_Tank_Disposal"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Toilet_Holding_Tank_Disposal"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Toilet_Holding_Tank_Disposal" />
+            <space />
+            <key key="amenity" value="sanitary_dump_station" />
+            <combo key="access" text="Access" values="yes,public,customers,no" />
+            <reference ref="fee" />
+            <optional>
+                <check key="sanitary_dump_station:pump-out" text="Suction pumpout" />
+                <check key="sanitary_dump_station:round_drain" text="Gravity drain for hose" />
+                <check key="sanitary_dump_station:basin" text="Casette or Elsan Disposal" />
+                <text key="operator" text="Operator" />
+                <combo key="opening_hours" text="Operation times" values="24/7" />
+                <check key="water_point" text="Can fill fresh water holding tank" />
+            </optional>
+        </item> <!-- Sanitary Dump Station -->
     </group> <!-- Accommodation -->
     <group name="Food+Drinks" icon="presets/restaurant.png">
         <item name="Restaurant" icon="presets/restaurant.png" type="node,closedway" preset_name_label="true">
@@ -4564,21 +4582,6 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=waste_disposal" />
             <key key="amenity" value="waste_disposal" />
         </item> <!-- Waste Disposal/Dumpster -->
-        <item name="Sanitary Dump Station" icon="styles/standard/service/recycling/sanitary_dump_station.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Toilet_Holding_Tank_Disposal"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Toilet_Holding_Tank_Disposal"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Toilet_Holding_Tank_Disposal"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Toilet_Holding_Tank_Disposal" />
-            <space />
-            <key key="amenity" value="sanitary_dump_station" />
-            <check key="sanitary_dump_station:pump-out" text="Suction pumpout" />
-            <check key="sanitary_dump_station:round_drain" text="Gravity drain for hose" />
-            <check key="sanitary_dump_station:basin" text="Casette or Elsan Disposal" />
-            <combo key="access" text="Access" values="yes,public,customers,no" />
-            <reference ref="fee" />
-            <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Operation times" values="24/7" />
-        </item> <!-- Sanitary Dump Station -->
         <separator/>
         <item name="Bench" icon="presets/bench.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench"