diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 93f16d814a..a119967e99 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -741,9 +741,9 @@ barrier|swing_gate;740;
barrier|chain;741;
sport|climbing;742;
sport|yoga;743;
-deprecated|deprecated;744;x
-deprecated|deprecated;745;x
-deprecated|deprecated;746;x
+amenity|parking_entrance;[amenity=parking_entrance];;name;int_name;744;
+amenity|parking_entrance|private;[amenity=parking_entrance][access=private];;name;int_name;745;
+amenity|parking_entrance|permissive;[amenity=parking_entrance][access=permissive];;name;int_name;746;
deprecated|deprecated;747;x
deprecated|deprecated;748;x
deprecated|deprecated;749;x
diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt
index 321838f12f..8ccdc5d4e0 100644
--- a/data/replaced_tags.txt
+++ b/data/replaced_tags.txt
@@ -54,7 +54,6 @@ sanitary_dump_station=customers : amenity=sanitary_dump_station
sanitary_dump_station=public : amenity=sanitary_dump_station
waterway=sanitary_dump_station : amenity=sanitary_dump_station
amenity=monastery : amenity=place_of_worship
-amenity=parking_entrance : amenity=parking
vending=parcel_pickup;parcel_mail_in : amenity=parcel_locker | u
vending=parcel_pickup : amenity=parcel_locker | u
vending=water : vending=drinks
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index b945916d98..d9e420f7e5 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -2188,6 +2188,49 @@
zh-Hans = 停车场
zh-Hant = 停車場
+ [type.amenity.parking_entrance.private]
+ ref = type.amenity.parking_entrance
+
+ [type.amenity.parking_entrance.permissive]
+ ref = type.amenity.parking_entrance
+
+ [type.amenity.parking_entrance]
+ en = Parking entrance
+ ar = ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻭ ﻞﺧﺪﻣ
+ be = Уваход на паркоўку
+ bg = Вход за паркинг
+ cs = Vjezd na parkoviště
+ da = Parkeringsindgang
+ de = Parkplatzeinfahrt
+ el = Είσοδος στάθμευσης
+ es = Entrada al aparcamiento
+ eu = Aparkalekuaren sarrera
+ fa = ﮓﻨﯿﮐﺭﺎﭘ ﯼﺩﻭﺭﻭ
+ fi = Pysäköinti sisäänkäynti
+ fr = Entrée du stationnement
+ he = הינחל הסינכ
+ hu = Parkoló bejárata
+ id = Pintu masuk parkir
+ it = Ingresso parcheggio
+ ja = 駐車場入口
+ ko = 주차장 입구
+ nb = Parkeringsinngang
+ nl = Parkeeringang
+ pl = Wejście na parking
+ pt = Entrada do estacionamento
+ pt-BR = Entrada do estacionamento
+ ro = Intrare parcare
+ ru = Въезд на парковку
+ sk = Vstup na parkovisko
+ sv = Parkering entré
+ sw = Mlango wa maegesho
+ th = ทางเข้าที่จอดรถ
+ tr = Otopark girişi
+ uk = Вхід на паркінг
+ vi = Lối vào bãi đậu xe
+ zh-Hans = 停车场入口
+ zh-Hant = 停車場入口
+
[type.amenity.parking_space]
en = Parking Space
ar = مكان لوقوف السيارات
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 67f619596d..5ac9852a42 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -2673,6 +2673,17 @@ node|z18-[amenity=parking],
area|z18-[amenity=parking]
{icon-image: parking-m.svg;font-size: 11;text-optional: true;}
+node|z17[amenity=parking_entrance],
+area|z17[amenity=parking_entrance]
+{icon-image: parking_entrance-m.svg;}
+node|z17[amenity=parking_entrance][access=permissive],
+node|z17[amenity=parking_entrance][access=private]
+{icon-image: zero-icon.svg;}
+
+node|z18-[amenity=parking_entrance],
+area|z18-[amenity=parking_entrance]
+{icon-image: parking_entrance-m.svg;font-size: 11;text-optional: true;}
+
node|z17-[amenity=bicycle_parking],
area|z17-[amenity=bicycle_parking]
{icon-image: bike-parking-m.svg;icon-min-distance: 20;}
diff --git a/data/styles/clear/style-clear/symbols/parking_entrance-m.svg b/data/styles/clear/style-clear/symbols/parking_entrance-m.svg
new file mode 100644
index 0000000000..396cfeda52
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/parking_entrance-m.svg
@@ -0,0 +1,110 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/parking_entrance-m.svg b/data/styles/clear/style-night/symbols/parking_entrance-m.svg
new file mode 100644
index 0000000000..3941052bb5
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/parking_entrance-m.svg
@@ -0,0 +1,111 @@
+
+