Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 8008)
+++ trunk/data/defaultpresets.xml	(revision 8009)
@@ -6736,10 +6736,4 @@
   <group name="Geography" icon="presets/peak.svg">
     <group name="Boundaries" icon="presets/boundaries.png">
-        <item name="National" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=national" />
-            <space />
-            <key key="boundary" value="national" />
-            <text key="name" text="Name" />
-        </item> <!-- National -->
         <item name="Administrative" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative"
@@ -7803,5 +7797,5 @@
             <text key="name" text="Name" />
             <optional>
-                <combo key="boundary" text="Boundary type" values="administrative,national,civil,political" values_searchable="true" />
+                <combo key="boundary" text="Boundary type" values="administrative,national_park,political,postal_code,protected_area" values_searchable="true" />
                 <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10" />
             </optional>
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 8008)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 8009)
@@ -4130,5 +4130,5 @@
 /*****************/
 
-way[boundary=national]::core_boundary,
+way[boundary=protected_area]::core_boundary,
 way[boundary=administrative]::core_boundary,
 way[boundary=postal_code]::core_boundary,