diff --git a/docs/layers.md b/docs/layers.md
index 0059e1118..f7ed1e891 100644
--- a/docs/layers.md
+++ b/docs/layers.md
@@ -966,6 +966,7 @@ To resolve inconsistency in data tagging in OpenStreetMap we normalize several o
 * `chemist` - A shop selling household chemicals, often including soaps, toothpaste and cosmetics.
 * `childcare`
 * `childrens_centre`
+* `chimney`
 * `chiropractor`
 * `cinema`
 * `clinic` with `kind_detail` property.
diff --git a/yaml/pois.yaml b/yaml/pois.yaml
index 3a65dab42..c6e1b0903 100644
--- a/yaml/pois.yaml
+++ b/yaml/pois.yaml
@@ -443,7 +443,7 @@ global:
         - landuse: quarry
         - leisure: [ dog_park, firepit, fishing, pitch, playground, slipway, swimming_area ]
         - lock: yes
-        - man_made: [ adit, communications_tower, crane, mast, mineshaft, obelisk, observatory,
+        - man_made: [ adit, communications_tower, chimney, crane, mast, mineshaft, obelisk, observatory,
             offshore_platform, petroleum_well, power_wind, telescope, water_tower,
             water_well, watermill, windmill ]
         - military: bunker
@@ -1255,7 +1255,20 @@ filters:
         case:
           - when: {historic: [monument, memorial]}
             then: {col: historic}
-
+  - filter: {man_made: chimney}
+    min_zoom:
+      lookup:
+        key: { call: { func: mz_to_float_meters, args: [ { col: height } ] } }
+        op: '>='
+        table:
+          - [ 14, 20 ]  # z14 if height >= 20m
+          - [ 15, 10 ]  # z15 if height >= 10m
+        default: 16
+    output:
+      <<: *output_properties
+      kind: chimney
+      tier: 5
+            
   ############################################################
   # TIER 6
   ############################################################