diff --git a/data/deprecated.json b/data/deprecated.json
index 0aac5551f..f2cca1e97 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -372,10 +372,26 @@
       "old": {"embankment": "true"},
       "replace": {"embankment": "yes"}
     },
+    {
+      "old": {"entrance": "emergency_exit"},
+      "replace": {"entrance": "emergency"}
+    },
+    {
+      "old": {"entrance": "fire_exit"},
+      "replace": {"entrance": "emergency"}
+    },
+    {
+      "old": {"entrance": "loading_dock"},
+      "replace": {"amenity": "loading_dock"}
+    },
     {
       "old": {"entrance": "main_entrance"},
       "replace": {"entrance": "main"}
     },
+    {
+      "old": {"entrance": "private"},
+      "replace": {"entrance": "yes", "access": "private"}
+    },
     {
       "old": {"escalator": "*"},
       "replace": {"highway": "steps", "conveying": "$1"}
diff --git a/data/taginfo.json b/data/taginfo.json
index 103e791fc..9dc33172a 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2002,7 +2002,11 @@
     {"key": "embankment", "value": "1", "description": "🄳 ➜ embankment=yes"},
     {"key": "embankment", "value": "false", "description": "🄳 ➜ embankment=no"},
     {"key": "embankment", "value": "true", "description": "🄳 ➜ embankment=yes"},
+    {"key": "entrance", "value": "emergency_exit", "description": "🄳 ➜ entrance=emergency"},
+    {"key": "entrance", "value": "fire_exit", "description": "🄳 ➜ entrance=emergency"},
+    {"key": "entrance", "value": "loading_dock", "description": "🄳 ➜ amenity=loading_dock"},
     {"key": "entrance", "value": "main_entrance", "description": "🄳 ➜ entrance=main"},
+    {"key": "entrance", "value": "private", "description": "🄳 ➜ entrance=yes + access=private"},
     {"key": "escalator", "description": "🄳 ➜ highway=steps + conveying=*"},
     {"key": "fee", "value": "0", "description": "🄳 ➜ fee=no"},
     {"key": "fee", "value": "free", "description": "🄳 ➜ fee=no"},