diff --git a/data/presets.yaml b/data/presets.yaml
index 8e15fee0a..9569bc78f 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3104,6 +3104,11 @@ en:
         name: Life Ring
         # 'terms: life buoy,kisby ring,kisbie ring,perry buoy'
         terms: '<translate with synonyms or related terms for ''Life Ring'', separated by commas>'
+      emergency/lifeguard:
+        # emergency=lifeguard
+        name: Lifeguard
+        # 'terms: CPR,rescue'
+        terms: '<translate with synonyms or related terms for ''Lifeguard'', separated by commas>'
       emergency/no:
         # emergency=no
         name: Emergency Access No
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 05238fd5f..e1073c254 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -317,6 +317,7 @@
     "emergency/fire_hydrant": {"icon": "temaki-fire_hydrant", "fields": ["fire_hydrant/type", "fire_hydrant/position", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["fire plug"], "tags": {"emergency": "fire_hydrant"}, "name": "Fire Hydrant"},
     "emergency/first_aid_kit": {"icon": "fas-medkit", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["bandage", "first aid", "med", "med kit", "medic*", "medkit"], "tags": {"emergency": "first_aid_kit"}, "name": "First Aid Kit"},
     "emergency/life_ring": {"icon": "fas-life-ring", "fields": ["ref", "operator"], "geometry": ["point", "vertex"], "terms": ["life buoy", "kisby ring", "kisbie ring", "perry buoy"], "tags": {"emergency": "life_ring"}, "name": "Life Ring"},
+    "emergency/lifeguard": {"icon": "fas-life-ring", "fields": ["ref", "operator", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["CPR", "rescue"], "tags": {"emergency": "lifeguard"}, "name": "Lifeguard"},
     "emergency/phone": {"icon": "maki-emergency-phone", "fields": ["ref", "operator", "covered", "indoor", "booth"], "geometry": ["point", "vertex"], "tags": {"emergency": "phone"}, "name": "Emergency Phone"},
     "emergency/siren": {"icon": "fas-volume-up", "fields": ["siren/purpose", "siren/type", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["air raid", "loud", "noise", "storm", "tornado", "warning"], "tags": {"emergency": "siren"}, "name": "Siren"},
     "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"},
diff --git a/data/presets/presets/emergency/lifeguard.json b/data/presets/presets/emergency/lifeguard.json
new file mode 100644
index 000000000..e8db4df69
--- /dev/null
+++ b/data/presets/presets/emergency/lifeguard.json
@@ -0,0 +1,21 @@
+{
+    "icon": "fas-life-ring",
+    "fields": [
+        "ref",
+        "operator",
+        "building_area",
+        "opening_hours"
+     ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "CPR",
+        "rescue"
+    ],
+    "tags": {
+        "emergency": "lifeguard"
+    },
+    "name": "Lifeguard"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 17ddab1ad..8b81b771a 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2164,6 +2164,13 @@
       "object_types": ["node"],
       "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-life-ring.svg?sanitize=true"
     },
+    {
+      "key": "emergency",
+      "value": "lifeguard",
+      "description": "Lifeguard",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-life-ring.svg?sanitize=true"
+    },
     {
       "key": "emergency",
       "value": "phone",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 7cbd379ba..8e7d8f57b 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4099,6 +4099,10 @@
                     "name": "Life Ring",
                     "terms": "life buoy,kisby ring,kisbie ring,perry buoy"
                 },
+                "emergency/lifeguard": {
+                    "name": "Lifeguard",
+                    "terms": "CPR,rescue"
+                },
                 "emergency/phone": {
                     "name": "Emergency Phone",
                     "terms": ""