Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 19173)
+++ trunk/resources/data/defaultpresets.xml	(revision 19178)
@@ -4991,4 +4991,24 @@
             <reference ref="name_ref_operator" />
         </item> <!-- Suction point -->
+        <separator />
+        <item name="Life Ring" icon="presets/emergency/life_ring.svg" type="node" preset_name_label="true">
+            <link wiki="Tag:emergency=life_ring" />
+            <space />
+            <key key="emergency" value="life_ring" />
+            <reference ref="ref_operator" />
+            <combo key="support" text="Support" values="pole,pillar,wall_mounted,fence" values_context="mounting/support" />
+            <reference ref="color" />
+            <preset_link preset_name="Life Guard" text="Similar but different tags:" />
+        </item>
+        <item name="Life Guard" icon="presets/emergency/lifeguard.svg" type="node,closedway,multipolygon" preset_name_label="true" >
+            <link wiki="Tag:emergency=lifeguard" />
+            <space />
+            <key key="emergency" value="lifeguard" />
+            <combo key="lifeguard" text="Type" values="tower,base" values_context="Tag:emergency=lifeguard" />
+            <reference ref="name_ref_operator" />
+            <reference ref="oh" />
+            <check key="seasonal" text="Seasonal" disable_off="true" />
+            <preset_link preset_name="Life Ring" text="Similar but different tags:" />
+        </item>
         <separator />
         <item name="Assembly Point" icon="presets/emergency/assembly_point.svg" type="node" preset_name_label="true">