Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 18896)
+++ trunk/resources/data/defaultpresets.xml	(revision 18897)
@@ -1262,5 +1262,5 @@
                 <checkgroup columns="2">
                     <check key="segregated" text="Segregated" />
-                    <check key="informal" text="Informal" disable_off="true" />
+                    <check key="informal" text="Informal" />
                 </checkgroup>
                 <combo key="foot" text="Foot" values="yes,official,designated,permissive,destination,delivery,permit,private,no" values_sort="false" />
@@ -1646,4 +1646,17 @@
             <text key="name" text="Name" />
         </item> <!-- Named Junction -->
+        <item name="Trailhead" icon="presets/landmark/trailhead.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:highway=trailhead" />
+            <key key="highway" value="trailhead" />
+            <reference ref="name_operator"/>
+            <optional>
+                <reference ref="fee" />
+                <text key="website" text="Website" />
+                <check key="drinking_water" text="Drinking Water" />
+                <check key="toilets" text="Toilets" />
+                <check key="bin" text="Waste Basket/Trash Can" />
+            </optional>
+            <preset_link preset_name="Access Restrictions" />
+        </item> <!-- Trailhead -->
         <separator/>
         <item name="Elevator" icon="presets/service/elevator.svg" type="node,way,closedway" preset_name_label="true">
@@ -4992,4 +5005,34 @@
             <check key="drive_through" text="Drive through" />
         </item> <!-- Post Box -->
+        <item name="Private Mailbox" icon="presets/service/letter_box.svg" type="node" preset_name_label="true">
+            <link wiki="Tag:amenity=letter_box" />
+            <space />
+            <key key="amenity" value="letter_box" />
+            <!-- post:<*> keys were copied from Address, with the addr: replaced by post: -->
+            <optional>
+                <reference ref="support"/>
+                <text key="post:housenumber" text="House number" match="key" auto_increment="-2,-1,+1,+2" />
+                <text key="post:street" text="Street name" use_last_as_default="force" match="key" alternative_autocomplete_keys="name" />
+                <text key="post:city" text="City name" use_last_as_default="force" match="key" />
+                <text key="post:postcode" text="Post code" use_last_as_default="force" match="key" />
+                <combo key="post:country" text="Country code" values_from="java.util.Locale#getISOCountries" use_last_as_default="force" match="key" values_context="country codes" />
+            </optional>
+            <optional text="Optional tag only for address without post:street">
+                <text key="post:place" text="Place name" use_last_as_default="force" match="key" alternative_autocomplete_keys="name" />
+            </optional>
+            <optional text="Optional tags for specific countries">
+                <text key="post:unit" text="Unit/Suite" match="key" />
+                <text key="post:housename" text="House name" match="key" alternative_autocomplete_keys="name" />
+                <text key="post:hamlet" text="Hamlet" match="key" />
+                <text key="post:suburb" text="Suburb" use_last_as_default="force" match="key" />
+                <text key="post:subdistrict" text="Subdistrict" use_last_as_default="force" match="key" />
+                <text key="post:district" text="District" use_last_as_default="force" match="key" />
+                <text key="post:province" text="Province" use_last_as_default="force" match="key" />
+                <!-- US States as defined in ISO 3166-2 -->
+                <combo key="post:state" text="State" text_context="addr:" values="AL,AK,AZ,AR,CA,CO,CT,DE,FL,GA,HI,ID,IL,IN,IA,KS,KY,LA,ME,MD,MA,MI,MN,MS,MO,MT,NE,NV,NH,NJ,NM,NY,NC,ND,OH,OK,OR,PA,RI,SC,SD,TN,TX,UT,VT,VA,WA,WV,WI,DC,AS,GU,MP,PR,UM,VI" use_last_as_default="force" match="key" />
+            </optional>
+            <preset_link preset_name="Post Box" text="Similar but different tags:" />
+            <preset_link preset_name="Post Office" text="Similar but different tags:" />
+        </item> <!-- Private Mailbox -->
         <item name="Telephone" icon="presets/service/telephone.svg" type="node" preset_name_label="true">
             <link wiki="Tag:amenity=telephone" />
@@ -5226,4 +5269,5 @@
             <text key="name" text="Name" />
             <reference ref="sport" />
+            <check key="building" text="Stadium Building" value_on="stadium" disable_off="true" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Stadium -->
@@ -5799,5 +5843,5 @@
             <link wiki="Key:building" />
             <space />
-            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,boathouse,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,digester,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,grandstand,greenhouse,hangar,hospital,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,pavilion,parking,public,retail,riding_hall,roof,ruins,school,service,shed,silo,sports_centre,sports_hall,stable,storage_tank,sty,supermarket,synagogue,temple,tent,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
+            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,boathouse,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,digester,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,grandstand,greenhouse,hangar,hospital,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,pavilion,parking,public,retail,riding_hall,roof,ruins,school,service,shed,silo,sports_centre,sports_hall,stable,stadium,storage_tank,sty,supermarket,synagogue,temple,tent,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
             <optional>
                 <reference ref="name_operator" />
Index: trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- trunk/resources/data/validator/ignoretags.cfg	(revision 18896)
+++ trunk/resources/data/validator/ignoretags.cfg	(revision 18897)
@@ -416,4 +416,5 @@
 K:barrier=wire_fence
 K:barrier=wood_fence
+K:building=no
 K:highway=ford
 K:highway=stile
Index: trunk/resources/images/presets/landmark/trailhead.svg
===================================================================
--- trunk/resources/images/presets/landmark/trailhead.svg	(revision 18897)
+++ trunk/resources/images/presets/landmark/trailhead.svg	(revision 18897)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <rect
+       style="fill:#deaa87;stroke:#784421;stroke-linecap:square"
+       id="rect1"
+       width="13"
+       height="6"
+       x="1.5"
+       y="1.5" />
+    <path
+       style="fill:none;stroke:#784421;stroke-width:2"
+       d="m 8,7 v 9"
+       id="path6" />
+    <path
+       style="fill:none;stroke:#2d2d2d;stroke-width:1px"
+       d="M 3,3.5 H 13"
+       id="path1" />
+    <path
+       style="fill:none;stroke:#2d2d2d;stroke-width:1px"
+       d="m 3,5.5 h 8"
+       id="path2" />
+  </g>
+</svg>
Index: trunk/resources/images/presets/service/letter_box.svg
===================================================================
--- trunk/resources/images/presets/service/letter_box.svg	(revision 18897)
+++ trunk/resources/images/presets/service/letter_box.svg	(revision 18897)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <g
+       id="g7">
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:1px"
+         d="m 10.5,16 v -2.5 h 5 V 6.996 C 15.25,5.25 15,4 12.5,2.996 V 0.5 h -4 v 2 H 5 C 1.978,2.814 0.7109,4.188 0.5,7 v 6.5 h 6 V 16"
+         id="path1" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:1px"
+         d="m 9,2.5 h 3.75"
+         id="path7" />
+    </g>
+    <g
+       id="g30">
+      <path
+         style="fill:#ffffff;stroke:#000000;stroke-linecap:square"
+         id="rect1"
+         d="m 5,3.5 h 5.5 c 2.21,0 4,1.291 4,3.5 v 5.5 H 1.5 V 7 C 1.5,4.791 2.791,3.5 5,3.5 Z" />
+      <path
+         style="fill:none;stroke:#000000"
+         d="m 5,3.5 c 2.209,0 3.5,1.291 3.5,3.5 v 5.5"
+         id="path2" />
+      <path
+         style="fill:none;stroke:#000000"
+         d="M 3,6.5 H 7"
+         id="path3" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:3"
+         d="M 8.5,12.25 V 16"
+         id="path4" />
+      <circle
+         style="fill:none;stroke:#000000;stroke-linecap:square"
+         id="path5"
+         cx="11.5"
+         cy="6.5"
+         r="0.5" />
+      <path
+         style="fill:none;stroke:#000000"
+         d="M 11.5,6 V 1.5 H 9"
+         id="path6" />
+    </g>
+  </g>
+</svg>
Index: trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/resources/styles/standard/elemstyles.mapcss	(revision 18896)
+++ trunk/resources/styles/standard/elemstyles.mapcss	(revision 18897)
@@ -859,4 +859,11 @@
 node[highway=rest_area] {
     icon-image: "presets/vehicle/rest_area.svg";
+    set icon_z17;
+}
+area[highway=trailhead] {
+    fill-color: services#c0c0c0;
+}
+node[highway=trailhead] {
+    icon-image: "presets/landmark/trailhead.svg";
     set icon_z17;
 }
@@ -3319,4 +3326,8 @@
     set icon_z17;
 }
+node[amenity=letter_box] {
+    icon-image: "presets/service/letter_box.svg";
+    set icon_z17;
+}
 node[amenity=studio] {
     icon-image: "presets/service/studio.svg";