diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 9a7d69512e..6e00d1ea98 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -540,7 +540,7 @@ highway|footway|demanding_mountain_hiking;[highway=footway][sac_scale=demanding_
 deprecated|deprecated;453;x
 deprecated|deprecated;454;x
 landuse|orchard;455;
-deprecated|deprecated;456;x
+amenity|shelter|public_transport;[amenity=shelter][shelter_type=public_transport];;name;int_name;456;
 highway|living_street|tunnel;[highway=living_street][tunnel?];;name;int_name;457;
 deprecated|deprecated;458;x
 deprecated|deprecated;459;x
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 8cd06959ba..454e7bcd37 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -4763,6 +4763,10 @@
     zh-Hans = 庇护所
     zh-Hant = 隱藏處
 
+  [type.amenity.shelter.public_transport]
+    comment = A weather shelter by the public transport stop.
+    ref = type.amenity.shelter
+
   [type.amenity.public_bath]
     en = Public Bath
     ar = حمام عام
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index 281af14fe9..750ed3df6d 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -989,6 +989,7 @@ tourism-artwork-painting                            # icon z15- (also has captio
 === 1550
 
 amenity-shelter                                     # icon z17- (also has caption(optional) z17-)
+amenity-shelter-public_transport
 leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z16-)
 === 1500
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 12dc4da5b7..92cb13ee01 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -989,6 +989,7 @@ tourism-artwork-painting                            # icon z15- (also has captio
 === 1550
 
 amenity-shelter                                     # icon z13- (also has caption(optional) z13-)
+amenity-shelter-public_transport
 leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z16-)
 === 1500