diff --git a/data/deprecated.json b/data/deprecated.json
index c242c9f4..7ec6760f 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -115,6 +115,10 @@
     "old": {"amenity": "kiosk"},
     "replace": {"shop": "kiosk"}
   },
+  {
+    "old": {"amenity": "lifeboat_station"},
+    "replace": {"emergency": "water_rescue"}
+  },
   {
     "old": {"amenity": "notice_board"},
     "replace": {"advertising": "board"}
@@ -570,6 +574,26 @@
     "old": {"embassy": "embassy"},
     "replace": {"embassy": "yes"}
   },
+  {
+    "old": {"emergency": "dry_riser_inlet"},
+    "replace": {"emergency": "fire_service_inlet", "fire_mains": "dry"}
+  },
+  {
+    "old": {"emergency": "sprinkler_connection"},
+    "replace": {"emergency": "fire_service_inlet", " fire_sprinkler": "yes"}
+  },
+  {
+    "old": {"emergency": "lifeboat_station"},
+    "replace": {"emergency": "water_rescue"}
+  },
+  {
+    "old": {"emergency": "marine_rescue"},
+    "replace": {"emergency": "water_rescue"}
+  },
+  {
+    "old": {"emergency_service": "air"},
+    "replace": {"emergency": "air_rescue_service"}
+  },
   {
     "old": {"entrance": "emergency_exit"},
     "replace": {"entrance": "emergency"}