diff --git a/data/presets.yaml b/data/presets.yaml
index 08dbae3ec..e6fc11af8 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1738,6 +1738,9 @@ en:
       place/city:
         name: City
         terms: "<translate with synonyms or related terms for 'City', separated by commas>"
+	  place/farm:
+        name: Farm
+        terms: "<translate with synonyms or related terms for 'Farm', separated by commas>"
       place/hamlet:
         name: Hamlet
         terms: "<translate with synonyms or related terms for 'Hamlet', separated by commas>"
diff --git a/data/presets/presets/place/farm.json b/data/presets/presets/place/farm.json
new file mode 100644
index 000000000..0a319a317
--- /dev/null
+++ b/data/presets/presets/place/farm.json
@@ -0,0 +1,11 @@
+{
+    "icon": "marker",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "place": "farm"
+    },
+    "name": "Farm"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 94dfb30e9..c8360e696 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1498,6 +1498,10 @@
         {
             "key": "place",
             "value": "city"
+        },
+		{
+            "key": "place",
+            "value": "farm"
         },
         {
             "key": "place",