Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 9724)
+++ /trunk/data/defaultpresets.xml	(revision 9725)
@@ -5937,5 +5937,5 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
             <space />
-            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,service,train_station,barn,stable,cabin,farm_auxiliary,transportation,greenhouse,office,university,hospital,kindergarten,manufacture,warehouse,retail,shed,storage_tank,supermarket,gasometer,cowshed,construction,basilica,cathedral,chapel,church,temple,mosque,synagogue,transformer_tower" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
+            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,service,train_station,barn,stable,cabin,farm_auxiliary,transportation,greenhouse,office,university,hospital,kindergarten,manufacture,warehouse,retail,shed,storage_tank,supermarket,gasometer,silo,cowshed,construction,basilica,cathedral,chapel,church,temple,mosque,synagogue,transformer_tower" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
             <text key="name" text="Name" />
             <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
@@ -6072,4 +6072,14 @@
             </optional>
         </item> <!-- Gasometer -->
+        <item name="Silo" icon="presets/silo.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=silo" />
+            <space />
+            <key key="man_made" value="silo" />
+            <optional>
+                <reference ref="name_operator" />
+                <combo key="building" text="Building" values="silo" values_context="building" />
+                <text key="height" text="Height (meters)" length="7" />
+            </optional>
+        </item> <!-- Silo -->
         <item name="Storage Tank" icon="presets/storage_tank.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=storage_tank"
Index: /trunk/data/validator/ignoretags.cfg
===================================================================
--- /trunk/data/validator/ignoretags.cfg	(revision 9724)
+++ /trunk/data/validator/ignoretags.cfg	(revision 9725)
@@ -265,5 +265,4 @@
 ;
 K:man_made=mast
-K:man_made=silo
 K:route=foot
 
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 9724)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 9725)
@@ -1395,4 +1395,5 @@
 area[man_made=chimney],
 area[man_made=gasometer],
+area[man_made=silo],
 area[man_made=storage_tank],
 area[man_made=bunker_silo],
@@ -1429,4 +1430,10 @@
 node[man_made=gasometer] {
     icon-image: "presets/gasometer.png";
+    icon-width: 16;
+    set icon_z17;
+    text: auto;
+}
+node[man_made=silo] {
+    icon-image: "presets/silo.png";
     icon-width: 16;
     set icon_z17;