diff --git a/data/presets.yaml b/data/presets.yaml
index dcb411575..bc65ba26f 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -367,6 +367,11 @@ en:
         label: Building
         # 'terms: structure'
         terms: '[translate with synonyms or related terms for ''Building'', separated by commas]'
+      building/flats:
+        # 'building:flats=*'
+        label: Units
+        # building/flats field placeholder
+        placeholder: '2, 4, 6, 8...'
       building/levels:
         # 'building:levels=*'
         label: Levels
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 32a5ae184..79e26b86a 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -57,6 +57,7 @@
   "bridge/support": {"key": "bridge:support", "type": "typeCombo", "label": "Type"},
   "building_area": {"key": "building", "type": "combo", "default": "yes", "geometry": ["area"], "label": "Building"},
   "building": {"key": "building", "type": "combo", "label": "Building", "terms": ["structure"]},
+  "building/flats": {"key": "building:flats", "type": "number", "minValue": 0, "label": "Units", "placeholder": "2, 4, 6, 8..."},
   "building/levels_building": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Building Levels", "placeholder": "2, 4, 6...", "prerequisiteTag": {"key": "building", "valueNot": "no"}},
   "building/levels": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Levels", "placeholder": "2, 4, 6..."},
   "building/levels/underground": {"key": "building:levels:underground", "type": "number", "minValue": 0, "label": "Underground Levels", "placeholder": "2, 4, 6...", "terms": ["basement levels"]},
diff --git a/data/presets/fields/building/flats.json b/data/presets/fields/building/flats.json
new file mode 100644
index 000000000..513f2c912
--- /dev/null
+++ b/data/presets/fields/building/flats.json
@@ -0,0 +1,7 @@
+{
+    "key": "building:flats",
+    "type": "number",
+    "minValue": 0,
+    "label": "Units",
+    "placeholder": "2, 4, 6, 8..."
+}
\ No newline at end of file
diff --git a/data/taginfo.json b/data/taginfo.json
index 5f59f4632..02e9d0803 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1387,6 +1387,7 @@
     {"key": "boules", "description": "🄵 Type"},
     {"key": "brand", "description": "🄵 Brand"},
     {"key": "brewery", "description": "🄵 Draft Beers"},
+    {"key": "building:flats", "description": "🄵 Units"},
     {"key": "building:levels", "description": "🄵 Building Levels, 🄵 Levels"},
     {"key": "building:levels:underground", "description": "🄵 Underground Levels"},
     {"key": "building:material", "description": "🄵 Material"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 6549f292f..1c8b3f8b9 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3070,6 +3070,10 @@
                     "label": "Building",
                     "terms": "structure"
                 },
+                "building/flats": {
+                    "label": "Units",
+                    "placeholder": "2, 4, 6, 8..."
+                },
                 "building/levels_building": {
                     "label": "Building Levels",
                     "terms": "",