diff --git a/data/presets.yaml b/data/presets.yaml
index 3e2c16943..6964128fe 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -7224,6 +7224,11 @@ en:
       railway/tram_stop:
         # railway=tram_stop
         name: Tram Stopping Position
+      railway/yard:
+        # railway=yard
+        name: Rail Yard
+        # 'terms: freight car stop,freight train station,rail freight station,railroad yard,railway yard'
+        terms: '<translate with synonyms or related terms for ''Rail Yard'', separated by commas>'
       relation:
         name: Relation
         terms: '<translate with synonyms or related terms for ''Relation'', separated by commas>'
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 9fc3ed5d3..e35667db9 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1000,6 +1000,7 @@
     "railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["switch", "points"], "name": "Railway Switch"},
     "railway/train_wash": {"icon": "maki-rail", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"},
     "railway/tram": {"icon": "temaki-tram", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram"},
+    "railway/yard": {"icon": "maki-rail", "fields": ["name", "operator"], "moreFields": ["gnis/feature_id"], "geometry": ["point"], "tags": {"railway": "yard"}, "terms": ["freight car stop", "freight train station", "rail freight station", "railroad yard", "railway yard"], "name": "Rail Yard"},
     "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"},
     "route/ferry": {"icon": "maki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "toll", "to", "from"], "moreFields": ["charge_toll", "dog", "interval", "maxheight", "maxweight", "network", "network/type", "opening_hours", "ref_route", "wheelchair"], "tags": {"route": "ferry"}, "terms": ["boat", "merchant vessel", "ship", "water bus", "water shuttle", "water taxi"], "name": "Ferry Route"},
     "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"},
diff --git a/data/presets/presets/railway/yard.json b/data/presets/presets/railway/yard.json
new file mode 100644
index 000000000..86c82789b
--- /dev/null
+++ b/data/presets/presets/railway/yard.json
@@ -0,0 +1,24 @@
+{
+    "icon": "maki-rail",
+    "fields": [
+        "name",
+        "operator"
+    ],
+    "moreFields": [
+        "gnis/feature_id"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "tags": {
+        "railway": "yard"
+    },
+    "terms": [
+        "freight car stop",
+        "freight train station",
+        "rail freight station",
+        "railroad yard",
+        "railway yard"
+    ],
+    "name": "Rail Yard"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index c525e229a..1c59c2e59 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -945,6 +945,7 @@
     {"key": "railway", "value": "switch", "description": "🄿 Railway Switch", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/junction.svg"},
     {"key": "railway", "value": "wash", "description": "🄿 Train Wash", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-15.svg"},
     {"key": "railway", "value": "tram", "description": "🄿 Tram", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tram.svg"},
+    {"key": "railway", "value": "yard", "description": "🄿 Rail Yard", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-15.svg"},
     {"key": "route", "value": "ferry", "description": "🄿 Ferry Route", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/ferry-15.svg"},
     {"key": "seamark:type", "value": "beacon_isolated_danger", "description": "🄿 Danger Beacon", "object_types": ["node"]},
     {"key": "seamark:type", "value": "beacon_lateral", "description": "🄿 Channel Beacon", "object_types": ["node"]},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index fd60cd36a..a7d45570a 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -8715,6 +8715,10 @@
                     "name": "Tram",
                     "terms": "light rail,streetcar,tram,trolley"
                 },
+                "railway/yard": {
+                    "name": "Rail Yard",
+                    "terms": "freight car stop,freight train station,rail freight station,railroad yard,railway yard"
+                },
                 "relation": {
                     "name": "Relation",
                     "terms": ""