Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 8327)
+++ trunk/data/defaultpresets.xml	(revision 8328)
@@ -5180,5 +5180,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,barn,farm_auxiliary,transportation,greenhouse,office,university,hospital,warehouse,retail,shed,cowshed,construction" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
+            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,barn,farm_auxiliary,transportation,greenhouse,office,university,hospital,warehouse,retail,shed,storage_tank,cowshed,construction" 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" />
@@ -5383,4 +5383,14 @@
             <text key="name" text="Name" />
         </item> <!-- Water Tower -->
+        <item name="Storage Tank" icon="presets/storage_tank.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=storage_tank"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=storage_tank"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=storage_tank" />
+            <key key="man_made" value="storage_tank" />
+            <combo key="building" text="Building" values="storage_tank" values_context="building" />
+            <combo key="content"  text="Content" values="fuel,manure,oil,sewage,silage,slurry,water,wine" values_context="content" />
+            <text key="operator" text="Operator" />
+            <text key="height" text="Height (meters)" length="7" />
+        </item> <!-- Storage Tank -->
         <item name="Water Works" icon="presets/water_works.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_works"
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 8327)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 8328)
@@ -1254,4 +1254,5 @@
 area[man_made=crane],
 area[man_made=gasometer],
+area[man_made=storage_tank],
 area[man_made=bunker_silo],
 area[man_made=lighthouse],
@@ -1292,4 +1293,10 @@
 node[man_made=gasometer] {
     icon-image: "presets/gasometer.png";
+    icon-width: 16;
+    set icon_z17;
+    text: auto;
+}
+node[man_made=storage_tank] {
+    icon-image: "presets/storage_tank.png";
     icon-width: 16;
     set icon_z17;