Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml	(revision 8253)
+++ data/defaultpresets.xml	(working copy)
@@ -2040,7 +2040,37 @@
             <key key="leisure" value="marina" />
             <text key="name" text="Name" />
             <combo key="sanitary_dump_station" text="Dump Station" values="yes,public,customers,no" />
+            <combo key="fuel"                  text="Fuel Station" values="yes,no" />
         </item> <!-- Marina -->
+        <item name="Marine Fuel" icon="presets/fuel.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=fuel"/>
+            <space />
+            <key key="waterway" value="fuel" />
+            <optional>
+                <combo key="brand" text="Brand" values="Agip,Aral,Avia,BP,Chevron,Citgo,Eni,Esso,Exxon,Gulf,Mobil,OMV,Petro-Canada,Pioneer,Q8,Repsol,Shell,Socar,Statoil,Sunoco,Tamoil,Texaco,Total,Independent" values_searchable="true" />
+                <label text="Fuel types:" />
+                <checkgroup columns="2">
+                    <check key="fuel:diesel" text="Diesel" />
+                    <check key="fuel:biodiesel" text="Bio Diesel" />
+                    <check key="fuel:octane_80" text="Octane 80" />
+                    <check key="fuel:octane_91" text="Octane 91" />
+                    <check key="fuel:octane_92" text="Octane 92" />
+                    <check key="fuel:octane_95" text="Octane 95" />
+                    <check key="fuel:octane_98" text="Octane 98" />
+                    <check key="fuel:octane_100" text="Octane 100" />
+                    <check key="fuel:e10" text="E10 (10% Ethanol mix)" />
+                    <check key="fuel:e85" text="E85 (85% Ethanol mix)" />
+                </checkgroup>
+                <space />
+                <label text="Fuel cards:" />
+                <checkgroup columns="3">
+                    <check key="payment:dkv" text="DKV" />
+                    <check key="payment:routex" text="Routex" />
+                    <check key="payment:uta" text="UTA" />
+                </checkgroup>
+            </optional>
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Marine Fuel. See also seamark:small_craft_facility:category=fuel_station -->
         <item name="Pier" icon="presets/pier.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pier"
@@ -3110,6 +3140,23 @@
             <key key="aeroway" value="gate" />
             <text key="ref" text="Reference" />
         </item> <!-- Gate -->
+        <item name="Aviation Fuel" icon="presets/fuel.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=fuel"/>
+            <space />
+            <key key="aeroway" value="fuel" />
+            <optional>
+                <combo key="brand" text="Brand" values="Agip,Aral,Avia,BP,Chevron,Citgo,Eni,Esso,Exxon,Gulf,Mobil,OMV,Petro-Canada,Pioneer,Q8,Repsol,Shell,Socar,Statoil,Sunoco,Tamoil,Texaco,Total,Independent" values_searchable="true" />
+                <label text="Fuel types:" />
+                <checkgroup columns="2">
+                    <check key="fuel:91UL"    text="91UL (clear)" />
+                    <check key="fuel:96UL"    text="96UL (clear)" />
+                    <check key="fuel:100LL"   text="100LL (blue)" />
+                    <check key="fuel:diesel"  text="Diesel" />
+                    <check key="fuel:autogas" text="Ethanol-Free Unleaded" />
+                </checkgroup>
+            </optional>
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Aviation Fuel -->
     </group> <!-- Airport -->
   </group> <!-- Transport -->
   <group name="Facilities" icon="presets/bed.png">