diff --git a/data/presets.yaml b/data/presets.yaml
index 5427f707e..a3b0f7c73 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -4010,6 +4010,11 @@ en:
         # office=architect
         name: Architect
         terms: '<translate with synonyms or related terms for ''Architect'', separated by commas>'
+      office/association:
+        # office=association
+        name: Association
+        # 'terms: organization,non-profit,society'
+        terms: '<translate with synonyms or related terms for ''Association'', separated by commas>'
       office/company:
         # office=company
         name: Company Office
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4cc6ce40f..0cefb5c18 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -11498,6 +11498,29 @@
             "terms": [],
             "name": "Architect"
         },
+        "office/association": {
+            "icon": "commercial",
+            "fields": [
+                "name",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "office": "association"
+            },
+            "terms": [
+                "organization",
+                "non-profit",
+                "society"
+            ],
+            "name": "Association"
+        },
         "office/company": {
             "icon": "commercial",
             "fields": [
diff --git a/data/presets/presets/office/association.json b/data/presets/presets/office/association.json
new file mode 100644
index 000000000..b82b36ba5
--- /dev/null
+++ b/data/presets/presets/office/association.json
@@ -0,0 +1,23 @@
+{
+  "icon": "commercial",
+  "fields": [
+      "name",
+      "address",
+      "building_area",
+      "opening_hours"
+  ],
+  "geometry": [
+      "point",
+      "vertex",
+      "area"
+  ],
+  "tags": {
+      "office": "association"
+  },
+  "terms": [
+    "organization",
+    "non-profit",
+    "society"
+  ],
+  "name": "Association"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 6e7f1651e..3201077e2 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2173,6 +2173,10 @@
             "key": "office",
             "value": "architect"
         },
+        {
+            "key": "office",
+            "value": "association"
+        },
         {
             "key": "office",
             "value": "company"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 96768d2c4..008b4ed28 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4606,6 +4606,10 @@
                     "name": "Architect",
                     "terms": ""
                 },
+                "office/association": {
+                    "name": "Association",
+                    "terms": "organization,non-profit,society"
+                },
                 "office/company": {
                     "name": "Company Office",
                     "terms": ""