Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 8009)
+++ trunk/data/defaultpresets.xml	(revision 8010)
@@ -6736,5 +6736,5 @@
   <group name="Geography" icon="presets/peak.svg">
     <group name="Boundaries" icon="presets/boundaries.png">
-        <item name="Administrative" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
+        <item name="Administrative" icon="presets/boundaries.png" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=administrative"
@@ -6747,4 +6747,6 @@
             <key key="boundary" value="administrative" />
             <text key="name" text="Name" />
+            <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10" />
+            <check key="maritime" text="Maritime" disable_off="true" />
         </item> <!-- Administrative -->
         <item name="Political" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
@@ -6756,5 +6758,5 @@
             <text key="name" text="Name" />
         </item> <!-- Political -->
-        <item name="Postal Code" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
+        <item name="Postal Code" icon="presets/boundaries.png" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=postal_code"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:boundary=postal_code" />
@@ -6788,4 +6790,11 @@
             </optional>
         </item> <!-- Protected Area -->
+        <item name="Maritime" icon="presets/boundaries.png" type="way,closedway,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=maritime" />
+            <space />
+            <key key="boundary" value="maritime" />
+            <combo key="border_type" text="Border type" values="baseline,territorial,contiguous,eez" />
+            <text key="name" text="Name" />
+        </item> <!-- Maritime -->
     </group> <!-- Boundaries -->
     <group name="Places" icon="styles/standard/place/settlement/isolated_dwelling.png">
@@ -7796,6 +7805,6 @@
             <key key="type" value="boundary" />
             <text key="name" text="Name" />
-            <optional>
-                <combo key="boundary" text="Boundary type" values="administrative,national_park,political,postal_code,protected_area" values_searchable="true" />
+            <combo key="boundary" text="Boundary type" values="administrative,maritime,national_park,political,postal_code,protected_area" values_searchable="true" />
+            <optional>
                 <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10" />
             </optional>