diff --git a/data/presets.yaml b/data/presets.yaml
index a5c716a72..f736c3a32 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -4112,6 +4112,11 @@ en:
         # man_made=bridge
         name: Bridge
         terms: '<translate with synonyms or related terms for ''Bridge'', separated by commas>'
+      man_made/bunker_silo:
+        # man_made=bunker_silo
+        name: Bunker Silo
+        # 'terms: Silage,Storage'
+        terms: '<translate with synonyms or related terms for ''Bunker Silo'', separated by commas>'
       man_made/chimney:
         # man_made=chimney
         name: Chimney
diff --git a/data/presets/fields.json b/data/presets/fields.json
index d295ff913..0a8b93d1f 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -56,7 +56,7 @@
     "communication_multi": {"key": "communication:", "type": "multiCombo", "label": "Communication Types"},
     "construction": {"key": "construction", "type": "combo", "label": "Type"},
     "contact/webcam": {"key": "contact:webcam", "type": "url", "icon": "website", "label": "Webcam URL", "placeholder": "http://example.com/"},
-    "content": {"key": "content", "type": "combo", "label": "Content"},
+    "content": {"key": "content", "type": "combo", "label": "Content", "options": ["silage", "water", "oil", "fuel", "slurry", "gas", "manure", "sewage"]},
     "country": {"key": "country", "type": "combo", "label": "Country"},
     "covered": {"key": "covered", "type": "check", "label": "Covered"},
     "craft": {"key": "craft", "type": "typeCombo", "label": "Type"},
diff --git a/data/presets/fields/content.json b/data/presets/fields/content.json
index e3710937b..574e19316 100644
--- a/data/presets/fields/content.json
+++ b/data/presets/fields/content.json
@@ -1,5 +1,6 @@
 {
     "key": "content",
     "type": "combo",
-    "label": "Content"
+    "label": "Content",
+    "options": ["silage", "water", "oil", "fuel", "slurry", "gas", "manure", "sewage"]
 }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 62e881f36..6371ba1b7 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -530,6 +530,7 @@
     "man_made/antenna": {"icon": "temaki-antenna", "fields": ["height", "communication_multi"], "geometry": ["point"], "terms": ["broadcast", "cell phone", "cell", "communication", "mobile phone", "radio", "television", "transmission", "tv"], "tags": {"man_made": "antenna"}, "name": "Antenna"},
     "man_made/breakwater": {"geometry": ["line", "area"], "tags": {"man_made": "breakwater"}, "name": "Breakwater"},
     "man_made/bridge": {"geometry": ["area"], "tags": {"man_made": "bridge"}, "name": "Bridge"},
+    "man_made/bunker_silo": {"icon": "temaki-silo", "fields": ["content"], "geometry": ["point", "area"], "terms": ["Silage", "Storage"], "tags": {"man_made": "bunker_silo"}, "name": "Bunker Silo"},
     "man_made/chimney": {"icon": "temaki-chimney", "geometry": ["point", "area"], "tags": {"man_made": "chimney"}, "name": "Chimney"},
     "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"},
     "man_made/crane": {"icon": "temaki-crane", "fields": ["operator", "height", "crane/type"], "geometry": ["point", "line", "vertex", "area"], "tags": {"man_made": "crane"}, "name": "Crane"},
diff --git a/data/presets/presets/man_made/bunker_silo.json b/data/presets/presets/man_made/bunker_silo.json
new file mode 100644
index 000000000..a4bf11536
--- /dev/null
+++ b/data/presets/presets/man_made/bunker_silo.json
@@ -0,0 +1,18 @@
+{
+    "icon": "temaki-silo",
+    "fields": [
+        "content"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "Silage",
+        "Storage"
+    ],
+    "tags": {
+        "man_made": "bunker_silo"
+    },
+    "name": "Bunker Silo"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 50d522098..8320ea677 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -3564,6 +3564,13 @@
       "description": "Bridge",
       "object_types": ["area"]
     },
+    {
+      "key": "man_made",
+      "value": "bunker_silo",
+      "description": "Bunker Silo",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/silo.svg?sanitize=true"
+    },
     {
       "key": "man_made",
       "value": "chimney",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index ea2058f79..33a11b6c0 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -5025,6 +5025,10 @@
                     "name": "Bridge",
                     "terms": ""
                 },
+                "man_made/bunker_silo": {
+                    "name": "Bunker Silo",
+                    "terms": "Silage,Storage"
+                },
                 "man_made/chimney": {
                     "name": "Chimney",
                     "terms": ""