diff --git a/data/categories.txt b/data/categories.txt
index a6334cc74a..21768d4b4f 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -14023,7 +14023,7 @@ el:Καμινάδα εργοστασίου
 sk:Komín
 mr:कारखाना चिमणी
 
-man_made-tower
+man_made-tower|man_made-flare
 en:Tower
 ru:Башня
 bg:Кула
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 9711e4c6b1..d3fab929b4 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -589,7 +589,7 @@ natural|grassland;474;
 emergency|lifeguard;475;
 emergency|mountain_rescue;476;
 aerialway|platter;477;
-deprecated|deprecated;478;x
+man_made|flare;478;
 deprecated|deprecated;479;x
 railway|preserved|tunnel;[railway=preserved][tunnel?];;name;int_name;480;
 boundary|protected_area|1;[boundary=protected_area][protect_class=1],[boundary=protected_area][protect_class=1a],[boundary=protected_area][protect_class=1b];;name;int_name;481;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 5106effce8..1da4fd3c9a 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -18950,6 +18950,10 @@
   [type.man_made.petroleum_well]
     en = Oil or gas well
 
+  [type.man_made.flare]
+    comment = A tower/mast constructed to burn off excess gas.
+    en = Gas Flare
+
   [type.man_made.wastewater_plant]
     en = Wastewater Treatment Plant
     af = Watersuiweringsaanleg
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 04b1b2d97e..ea4ca8c6ef 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -1090,6 +1090,7 @@ node|z19-[power=substation],
 area|z19-[power=substation],
 node|z18-[man_made=survey_point],
 node|z18-[man_made=petroleum_well],
+node|z18-[man_made=flare],
 node|z19-[emergency=fire_hydrant],
 node|z19-[man_made=cairn],
 {text: name;text-color: @poi_label;text-offset: 1;font-size: 10;}
@@ -1572,6 +1573,7 @@ node|z16-[man_made=mast],
 /* TODO: needs a better icon */
 node|z16-[man_made=tower],
 node|z16-[man_made=tower][tower:type=communication],
+node|z16-[man_made=flare],
 {icon-image: mast-m.svg;}
 
 /* TODO: needs a better icon */
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index b7c29a3e09..6a907af361 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -1084,6 +1084,7 @@ leisure-ice_rink                                    # icon z17- (also has captio
 leisure-pitch                                       # icon z17- (also has caption(optional) z17-, area z15-)
 man_made-chimney                                    # icon z16- (also has caption(optional) z18-)
 man_made-flagpole                                   # icon z15-
+man_made-flare
 man_made-tower                                      # icon z16- (also has caption(optional) z18-)
 man_made-tower-communication                        # icon z16- (also has caption(optional) z18-)
 === 850
diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss
index 89aed8090c..707d976136 100644
--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/data/styles/outdoors/include/Icons.mapcss
@@ -395,6 +395,7 @@ node|z16-[man_made=communications_tower],
 
 node|z14-[man_made=tower],
 node|z14-[man_made=tower][tower:type=communication],
+node|z13-[man_made=flare],
 {icon-image: mast-m.svg; font-size: 11;}
 
 node|z13-[man_made=tower],
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 39726bc216..fecfcb332f 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -1084,6 +1084,7 @@ leisure-ice_rink                                    # icon z17- (also has captio
 leisure-pitch                                       # icon z17- (also has caption(optional) z17-, area z15-)
 man_made-chimney                                    # icon z16- (also has caption(optional) z18-)
 man_made-flagpole                                   # icon z12- (also has caption(optional) z14-)
+man_made-flare
 man_made-tower                                      # icon z13- (also has caption(optional) z14-)
 man_made-tower-communication                        # icon z13- (also has caption(optional) z14-)
 === 850
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 4ce7e4f15d..cb103726a9 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -2503,6 +2503,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"man_made", "cross"},
     {"man_made", "cutline"},
     {"man_made", "embankment"},
+    {"man_made", "flare"},
     {"man_made", "lighthouse"},
     {"man_made", "petroleum_well"},
     {"man_made", "pier"},