diff --git a/data/presets.yaml b/data/presets.yaml
index 7002e70a9..e65d3cbce 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2480,6 +2480,11 @@ en:
         # 'amenity=shelter, shelter_type=lean_to'
         name: Lean-To
         terms: '<translate with synonyms or related terms for ''Lean-To'', separated by commas>'
+      amenity/shelter/public_transport:
+        # 'amenity=shelter, shelter_type=public_transport'
+        name: Transit Shelter
+        # 'terms: bus stop,metro stop,waiting'
+        terms: '<translate with synonyms or related terms for ''Transit Shelter'', separated by commas>'
       amenity/shower:
         # amenity=shower
         name: Shower
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 822f370ea..06a5024b2 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -132,6 +132,7 @@
     "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "bin"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"},
     "amenity/shelter/gazebo": {"icon": "maki-shelter", "fields": ["name", "building_area", "bench", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "gazebo"}, "name": "Gazebo"},
     "amenity/shelter/lean_to": {"icon": "maki-shelter", "fields": ["name", "operator", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "name": "Lean-To"},
+    "amenity/shelter/public_transport": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "lit"], "geometry": ["point", "area"], "terms": ["bus stop", "metro stop", "waiting"], "tags": {"amenity": "shelter", "shelter_type": "public_transport"}, "reference": {"key": "shelter_type", "value": "public_transport"}, "name": "Transit Shelter"},
     "amenity/shower": {"icon": "temaki-shower", "fields": ["operator", "opening_hours", "fee", "supervised", "building_area", "access_simple"], "geometry": ["point", "vertex", "area"], "terms": ["rain closet"], "tags": {"amenity": "shower"}, "name": "Shower"},
     "amenity/smoking_area": {"icon": "fas-smoking", "fields": ["name", "shelter", "bin", "bench", "opening_hours"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "smoking_area"}, "name": "Smoking Area"},
     "amenity/social_facility": {"icon": "temaki-social_facility", "fields": ["name", "operator", "address", "building_area", "social_facility", "social_facility_for", "opening_hours", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility"}, "name": "Social Facility"},
diff --git a/data/presets/presets/amenity/shelter/public_transport.json b/data/presets/presets/amenity/shelter/public_transport.json
new file mode 100644
index 000000000..e7ee477f8
--- /dev/null
+++ b/data/presets/presets/amenity/shelter/public_transport.json
@@ -0,0 +1,28 @@
+{
+    "icon": "maki-shelter",
+    "fields": [
+        "name",
+        "shelter_type",
+        "building_area",
+        "bench",
+        "lit"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bus stop",
+        "metro stop",
+        "waiting"
+    ],
+    "tags": {
+        "amenity": "shelter",
+        "shelter_type": "public_transport"
+    },
+    "reference": {
+        "key": "shelter_type",
+        "value": "public_transport"
+    },
+    "name": "Transit Shelter"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 1b16f7129..694bc6281 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -896,6 +896,13 @@
       "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shelter-15.svg?sanitize=true"
     },
+    {
+      "key": "shelter_type",
+      "value": "public_transport",
+      "description": "Transit Shelter",
+      "object_types": ["node", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shelter-15.svg?sanitize=true"
+    },
     {
       "key": "amenity",
       "value": "shower",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 603b90d0d..9e8f55edf 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3587,6 +3587,10 @@
                     "name": "Lean-To",
                     "terms": ""
                 },
+                "amenity/shelter/public_transport": {
+                    "name": "Transit Shelter",
+                    "terms": "bus stop,metro stop,waiting"
+                },
                 "amenity/shower": {
                     "name": "Shower",
                     "terms": "rain closet"