diff --git a/data/categories.txt b/data/categories.txt
index 5c4b8ee29e..f384b9406c 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -12421,6 +12421,10 @@ vi:Tháp truyền thông
 zh-Hans:通讯塔
 zh-Hant:通訊塔
 
+# Please avoid synonyms like Gas/Fuel so that Gas station search doesn't return Gas wells :)
+man_made-petroleum_well
+en:Petroleum well|oil|boring
+
 organic-only|organic-yes
 en:4organic|bio|biological|eco|ecological|healthy
 ar:بيولوجي|بيولوجي|صحي|بيولوجي|بيئي|طبيعي|عضوي
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 5c99906bf3..e8595a3281 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -583,7 +583,8 @@ area:highway|steps;470;
 # ~90k usages.
 amenity|telephone;471;
 man_made|communications_tower;472;
-deprecated|deprecated;473;x
+# ~260k uses.
+man_made|petroleum_well;[man_made=petroleum_well],[man_made=gas_well];;;;473;
 natural|grassland;474;
 deprecated|deprecated;475;x
 deprecated|deprecated;476;x
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 88dac7e087..1f62a49c7a 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -18940,6 +18940,9 @@
     ref = type.man_made.communications_tower
     ru = Вышка связи
 
+  [type.man_made.petroleum_well]
+    en = Oil or gas well
+
   [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 a7187e66ff..2dab3e7a11 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -1087,6 +1087,7 @@ area|z18-[amenity=public_bookcase],
 node|z19-[power=substation],
 area|z19-[power=substation],
 node|z18-[man_made=survey_point],
+node|z18-[man_made=petroleum_well],
 node|z19-[emergency=fire_hydrant],
 node|z19-[man_made=cairn],
 {text: name;text-color: @poi_label;text-offset: 1;font-size: 10;}
@@ -1566,10 +1567,15 @@ node|z15-[man_made=flagpole],
 node|z16-[man_made=mast],
 {icon-image: dot-m.svg;}
 
+/* TODO: needs a better icon */
 node|z16-[man_made=tower],
 node|z16-[man_made=tower][tower:type=communication],
 {icon-image: mast-m.svg;}
 
+/* TODO: needs a better icon */
+node|z17-[man_made=petroleum_well],
+{icon-image: mast-m.svg;}
+
 node|z16-[amenity=taxi],
 area|z16-[amenity=taxi]
 {icon-image: taxi-m.svg;icon-min-distance: 30;}
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index de8ae47173..9a66a5a79e 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -1239,6 +1239,7 @@ power-generator                                     # icon z17-
 power-generator-gas                                 # icon z17-
 power-generator-hydro                               # icon z17-
 power-generator-wind                                # icon z15- (also has caption(optional) z18-)
+man_made-petroleum_well
 === 120
 
 amenity-parking-lane-private                        # icon z19- (also has caption(optional) z19-, area z17-)
diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss
index 663f98e1b7..ca2cfac242 100644
--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/data/styles/outdoors/include/Icons.mapcss
@@ -408,6 +408,12 @@ node|z14-[amenity=hunting_stand],
 node|z16-[amenity=hunting_stand],
 {font-size: 12;}
 
+/* TODO: needs a better icon */
+node|z14-[man_made=petroleum_well],
+{icon-image: mast-m.svg; font-size: 11;}
+node|z16-[man_made=petroleum_well],
+{font-size: 12;}
+
 node|z17-[man_made=cairn],
 {icon-image: cairn-m.svg;text: name;text-color: @poi_label;font-size: 12;text-offset: 1;}
 
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 14e276c94d..13a6383347 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -1239,6 +1239,7 @@ power-generator                                     # icon z17-
 power-generator-gas                                 # icon z17-
 power-generator-hydro                               # icon z17-
 power-generator-wind                                # icon z13- (also has caption(optional) z16-)
+man_made-petroleum_well
 === 120
 
 amenity-parking-lane-private                        # icon z19- (also has caption(optional) z19-, area z17-)
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 9f394b2648..1348712c04 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -2502,8 +2502,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"man_made", "cutline"},
     {"man_made", "embankment"},
     {"man_made", "lighthouse"},
-    {"man_made", "survey_point"},
+    {"man_made", "petroleum_well"},
     {"man_made", "pier"},
+    {"man_made", "survey_point"},
     {"man_made", "silo"},
     {"man_made", "storage_tank"},
     {"man_made", "tower"},