diff --git a/data/presets.yaml b/data/presets.yaml
index 1b370b2cd5..6f93e12684 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2183,6 +2183,10 @@ en:
         name: Shower
         # 'terms: rain closet'
         terms: '<translate with synonyms or related terms for ''Shower'', separated by commas>'
+      amenity/smoking_area:
+        # amenity=smoking_area
+        name: Smoking Area
+        terms: '<translate with synonyms or related terms for ''Smoking Area'', separated by commas>'
       amenity/social_facility:
         # amenity=social_facility
         name: Social Facility
diff --git a/data/presets/presets.json b/data/presets/presets.json
index ce5ebd7049..e2bbfd3be6 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2817,6 +2817,25 @@
             },
             "name": "Shower"
         },
+        "amenity/smoking_area": {
+            "fields": [
+                "name",
+                "shelter",
+                "bin",
+                "bench",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "amenity": "smoking_area"
+            },
+            "name": "Smoking Area"
+        },
         "amenity/social_facility": {
             "icon": "poi-social-facility",
             "fields": [
diff --git a/data/presets/presets/amenity/smoking_area.json b/data/presets/presets/amenity/smoking_area.json
new file mode 100644
index 0000000000..fba420882a
--- /dev/null
+++ b/data/presets/presets/amenity/smoking_area.json
@@ -0,0 +1,20 @@
+{
+    "fields": [
+        "name",
+        "shelter",
+        "bin",
+        "bench",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [
+    ],
+    "tags": {
+        "amenity": "smoking_area"
+    },
+    "name": "Smoking Area"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 704e486255..e795d3ab2a 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -507,6 +507,10 @@
             "key": "amenity",
             "value": "shower"
         },
+        {
+            "key": "amenity",
+            "value": "smoking_area"
+        },
         {
             "key": "amenity",
             "value": "social_facility"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 82690ebead..74108c30a8 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3144,6 +3144,10 @@
                     "name": "Shower",
                     "terms": "rain closet"
                 },
+                "amenity/smoking_area": {
+                    "name": "Smoking Area",
+                    "terms": ""
+                },
                 "amenity/social_facility": {
                     "name": "Social Facility",
                     "terms": ""