diff --git a/data/categories.txt b/data/categories.txt
index f384b9406c..20d63981bd 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -15758,6 +15758,9 @@ zh-Hant:消防栓
 fa:شیر آتش‌نشانی
 mr:अग्निशामक नाळ|फायर हायड्रंट
 
+emergency-lifeguard
+en:Lifeguard|lifesaver
+
 leisure-fitness_station
 en:3Fitness Station|street workout
 ru:4Спортивные снаряды
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index e8595a3281..277958b24f 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -586,7 +586,7 @@ man_made|communications_tower;472;
 # ~260k uses.
 man_made|petroleum_well;[man_made=petroleum_well],[man_made=gas_well];;;;473;
 natural|grassland;474;
-deprecated|deprecated;475;x
+emergency|lifeguard;475;
 deprecated|deprecated;476;x
 aerialway|platter;477;
 deprecated|deprecated;478;x
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 1f62a49c7a..93fc171cde 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -11904,6 +11904,10 @@
     zh-Hans = 紧急电话
     zh-Hant = 緊急電話
 
+  [type.emergency.lifeguard]
+    comment = A place where a lifeguard is on duty.
+    en = Lifeguard
+
   [type.entrance]
     comment = This is for secondary entrances, for main entrances see type.entrance.main
     en = Entrance
diff --git a/data/styles/default/dark/symbols/lifeguard-m.svg b/data/styles/default/dark/symbols/lifeguard-m.svg
new file mode 100644
index 0000000000..6c7df76192
--- /dev/null
+++ b/data/styles/default/dark/symbols/lifeguard-m.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.6667 2.6667v1.6667l10.667 2.6667v-1.6667zm1.3333 3.3333v6h8v-4zm-1.3333 7.3333v1.3333h1.3333l-1.3333 6.6667h2l1.3333-6.6667h4l1.375 6.6667h2l-1.375-6.6667h1.3333v-1.3333z" fill="#C15746" opacity=".6"/>
+</svg>
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 2dab3e7a11..57d9bcbb5b 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -1051,6 +1051,7 @@ node|z18-[emergency=defibrillator],
 area|z18-[emergency=defibrillator],
 node|z18-[emergency=assembly_point],
 area|z18-[emergency=assembly_point],
+node|z18-[emergency=lifeguard],
 node|z18-[amenity=toilets],
 area|z18-[amenity=toilets],
 node|z18-[amenity=atm],
@@ -1703,6 +1704,9 @@ node|z18-[emergency=assembly_point],
 area|z18-[emergency=assembly_point]
 {icon-image: assembly_point-m.svg;font-size: 11;}
 
+node|z17-[emergency=lifeguard],
+{icon-image: lifeguard-m.svg; font-size: 11;}
+
 node|z17-[office=lawyer],
 area|z17-[office=lawyer]
 {icon-image: lawyer-m.svg;}
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 9a66a5a79e..8e75260aa5 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -994,6 +994,7 @@ tourism-artwork-painting                            # icon z15- (also has captio
 
 amenity-shelter                                     # icon z17- (also has caption(optional) z17-)
 amenity-shelter-public_transport                    # icon z17- (also has caption(optional) z17-)
+emergency-lifeguard
 leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z16-)
 === 1500
diff --git a/data/styles/default/light/symbols/lifeguard-m.svg b/data/styles/default/light/symbols/lifeguard-m.svg
new file mode 100644
index 0000000000..c86e0dc0fd
--- /dev/null
+++ b/data/styles/default/light/symbols/lifeguard-m.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.6667 2.6667v1.6667l10.667 2.6667v-1.6667zm1.3333 3.3333v6h8v-4zm-1.3333 7.3333v1.3333h1.3333l-1.3333 6.6667h2l1.3333-6.6667h4l1.375 6.6667h2l-1.375-6.6667h1.3333v-1.3333z" fill="#C15746"/>
+</svg>
diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss
index ca2cfac242..fa90ddd9ae 100644
--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/data/styles/outdoors/include/Icons.mapcss
@@ -434,3 +434,8 @@ node|z14-[man_made=cross],
 {icon-image: cross-m.svg; font-size: 11;}
 node|z16-[man_made=cross],
 {font-size: 12;}
+
+node|z14-[emergency=lifeguard],
+{icon-image: lifeguard-m.svg; font-size: 11;}
+node|z16-[emergency=lifeguard],
+{font-size: 12;}
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 13a6383347..8de0a54ceb 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -994,6 +994,7 @@ tourism-artwork-painting                            # icon z15- (also has captio
 
 amenity-shelter                                     # icon z12- (also has caption(optional) z13-)
 amenity-shelter-public_transport                    # icon z14- (also has caption(optional) z14-)
+emergency-lifeguard
 leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z16-)
 === 1500
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 1348712c04..bebc6c4980 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -2387,6 +2387,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"cuisine", "vietnamese"},
     {"emergency", "defibrillator"},
     {"emergency", "fire_hydrant"},
+    {"emergency", "lifeguard"},
     {"emergency", "phone"},
     {"fee", "no"},
     {"fee", "yes"},