diff --git a/data/presets.yaml b/data/presets.yaml
index b367bee15..e875c38cc 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2567,6 +2567,10 @@ en:
         name: Entrance/Exit
       building/farm:
         # building=farm
+        name: Farm House
+        terms: '<translate with synonyms or related terms for ''Farm House'', separated by commas>'
+      building/farm_auxiliary:
+        # building=farm_auxiliary
         name: Farm Building
         terms: '<translate with synonyms or related terms for ''Farm Building'', separated by commas>'
       building/garage:
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 57635ddfb..57fc2921c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4497,6 +4497,22 @@
             "matchScore": 0.5,
             "name": "Dormitory"
         },
+        "building/farm_auxiliary": {
+            "icon": "farm",
+            "fields": [
+                "name",
+                "address",
+                "levels"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "building": "farm_auxiliary"
+            },
+            "matchScore": 0.5,
+            "name": "Farm Building"
+        },
         "building/farm": {
             "icon": "farm",
             "fields": [
@@ -4511,7 +4527,7 @@
                 "building": "farm"
             },
             "matchScore": 0.5,
-            "name": "Farm Building"
+            "name": "Farm House"
         },
         "building/garage": {
             "icon": "warehouse",
diff --git a/data/presets/presets/building/farm.json b/data/presets/presets/building/farm.json
index ac9366286..ef9f9e1bb 100644
--- a/data/presets/presets/building/farm.json
+++ b/data/presets/presets/building/farm.json
@@ -12,5 +12,5 @@
         "building": "farm"
     },
     "matchScore": 0.5,
-    "name": "Farm Building"
+    "name": "Farm House"
 }
diff --git a/data/presets/presets/building/farm_auxiliary.json b/data/presets/presets/building/farm_auxiliary.json
new file mode 100644
index 000000000..070af2d4f
--- /dev/null
+++ b/data/presets/presets/building/farm_auxiliary.json
@@ -0,0 +1,16 @@
+{
+    "icon": "farm",
+    "fields": [
+        "name",
+        "address",
+        "levels"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "farm_auxiliary"
+    },
+    "matchScore": 0.5,
+    "name": "Farm Building"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index d206b8f4c..1c07efae5 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -844,6 +844,10 @@
             "key": "building",
             "value": "dormitory"
         },
+        {
+            "key": "building",
+            "value": "farm_auxiliary"
+        },
         {
             "key": "building",
             "value": "farm"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index a5f9bcbe6..f3c46d27b 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3581,10 +3581,14 @@
                     "name": "Dormitory",
                     "terms": ""
                 },
-                "building/farm": {
+                "building/farm_auxiliary": {
                     "name": "Farm Building",
                     "terms": ""
                 },
+                "building/farm": {
+                    "name": "Farm House",
+                    "terms": ""
+                },
                 "building/garage": {
                     "name": "Garage",
                     "terms": ""