diff --git a/data/presets.yaml b/data/presets.yaml
index c39a763797..c992fa4e40 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3750,6 +3750,11 @@ en:
         # railway=abandoned
         name: Abandoned Railway
         terms: '<translate with synonyms or related terms for ''Abandoned Railway'', separated by commas>'
+      railway/buffer_stop:
+        # railway=buffer_stop
+        name: Buffer Stop
+        # 'terms: stop,halt,buffer'
+        terms: '<translate with synonyms or related terms for ''Buffer Stop'', separated by commas>'
       railway/crossing:
         # railway=crossing
         name: Railway Crossing (Path)
diff --git a/data/presets/presets.json b/data/presets/presets.json
index fc9b7397c7..c459696343 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -10279,6 +10279,21 @@
             "terms": [],
             "name": "Abandoned Railway"
         },
+        "railway/buffer_stop": {
+            "icon": "poi-buffer-stop",
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "railway": "buffer_stop"
+            },
+            "terms": [
+                "stop",
+                "halt",
+                "buffer"
+            ],
+            "name": "Buffer Stop"
+        },
         "railway/crossing": {
             "icon": "cross",
             "geometry": [
diff --git a/data/presets/presets/railway/buffer_stop.json b/data/presets/presets/railway/buffer_stop.json
new file mode 100644
index 0000000000..a0f6f81651
--- /dev/null
+++ b/data/presets/presets/railway/buffer_stop.json
@@ -0,0 +1,15 @@
+{
+    "icon": "poi-buffer-stop",
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "railway": "buffer_stop"
+    },
+    "terms": [
+        "stop",
+        "halt",
+        "buffer"
+    ],
+    "name": "Buffer Stop"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index d6dff296a5..245fb91345 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2129,6 +2129,10 @@
             "key": "railway",
             "value": "abandoned"
         },
+        {
+            "key": "railway",
+            "value": "buffer_stop"
+        },
         {
             "key": "railway",
             "value": "crossing"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index be17fa35c6..9d9ec02142 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4396,6 +4396,10 @@
                     "name": "Abandoned Railway",
                     "terms": ""
                 },
+                "railway/buffer_stop": {
+                    "name": "Buffer Stop",
+                    "terms": "stop,halt,buffer"
+                },
                 "railway/crossing": {
                     "name": "Railway Crossing (Path)",
                     "terms": "crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing"