diff --git a/data/presets.yaml b/data/presets.yaml
index c992fa4e40..9b503802e5 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -730,6 +730,11 @@ en:
       maxweight:
         # maxweight=*
         label: Max Weight
+      milestone_position:
+        # 'railway:position=*'
+        label: Milestone Position
+        # milestone_position field placeholder
+        placeholder: Distance to one decimal (123.4)
       mtb/scale:
         # 'mtb:scale=*'
         label: Mountain Biking Difficulty
@@ -3760,6 +3765,11 @@ en:
         name: Railway Crossing (Path)
         # 'terms: crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing'
         terms: '<translate with synonyms or related terms for ''Railway Crossing (Path)'', separated by commas>'
+      railway/derail:
+        # railway=derail
+        name: Railway Derailer
+        # 'terms: derailer'
+        terms: '<translate with synonyms or related terms for ''Railway Derailer'', separated by commas>'
       railway/disused:
         # railway=disused
         name: Disused Railway
@@ -3779,6 +3789,11 @@ en:
         name: Railway Crossing (Road)
         # 'terms: crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing'
         terms: '<translate with synonyms or related terms for ''Railway Crossing (Road)'', separated by commas>'
+      railway/milestone:
+        # railway=milestone
+        name: Railway Milestone
+        # 'terms: milestone,marker'
+        terms: '<translate with synonyms or related terms for ''Railway Milestone'', separated by commas>'
       railway/monorail:
         # railway=monorail
         name: Monorail
@@ -3796,6 +3811,11 @@ en:
         # railway=rail
         name: Rail
         terms: '<translate with synonyms or related terms for ''Rail'', separated by commas>'
+      railway/signal:
+        # railway=signal
+        name: Railway Signal
+        # 'terms: signal,lights'
+        terms: '<translate with synonyms or related terms for ''Railway Signal'', separated by commas>'
       railway/station:
         # railway=station
         name: Railway Station
@@ -3811,6 +3831,16 @@ en:
         name: Subway Entrance
         # 'terms: metro,transit'
         terms: '<translate with synonyms or related terms for ''Subway Entrance'', separated by commas>'
+      railway/switch:
+        # railway=switch
+        name: Railway Switch
+        # 'terms: switch,points'
+        terms: '<translate with synonyms or related terms for ''Railway Switch'', separated by commas>'
+      railway/train_wash:
+        # railway=wash
+        name: Train Wash
+        # 'terms: wash,clean'
+        terms: '<translate with synonyms or related terms for ''Train Wash'', separated by commas>'
       railway/tram:
         # railway=tram
         name: Tram
diff --git a/data/presets/fields.json b/data/presets/fields.json
index f1f4c1ac44..3c603245bc 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -1028,6 +1028,12 @@
             "label": "Max Weight",
             "snake_case": false
         },
+        "milestone_position": {
+            "key": "railway:position",
+            "type": "text",
+            "placeholder": "Distance to one decimal (123.4)",
+            "label": "Milestone Position"
+        },
         "mtb/scale": {
             "key": "mtb:scale",
             "type": "combo",
diff --git a/data/presets/fields/milestone_position.json b/data/presets/fields/milestone_position.json
new file mode 100644
index 0000000000..6573465158
--- /dev/null
+++ b/data/presets/fields/milestone_position.json
@@ -0,0 +1,6 @@
+{
+    "key": "railway:position",
+    "type": "text",
+    "placeholder": "Distance to one decimal (123.4)",
+    "label": "Milestone Position"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index c459696343..09e3de2b71 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -10313,6 +10313,19 @@
             ],
             "name": "Railway Crossing (Path)"
         },
+        "railway/derail": {
+            "icon": "roadblock",
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "railway": "derail"
+            },
+            "terms": [
+                "derailer"
+            ],
+            "name": "Railway Derailer"
+        },
         "railway/disused": {
             "icon": "railway-disused",
             "geometry": [
@@ -10386,6 +10399,24 @@
             ],
             "name": "Railway Crossing (Road)"
         },
+        "railway/milestone": {
+            "icon": "triangle-stroked",
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "fields": [
+                "milestone_position"
+            ],
+            "tags": {
+                "railway": "milestone"
+            },
+            "terms": [
+                "milestone",
+                "marker"
+            ],
+            "name": "Railway Milestone"
+        },
         "railway/monorail": {
             "icon": "railway-monorail",
             "geometry": [
@@ -10457,6 +10488,21 @@
             "terms": [],
             "name": "Rail"
         },
+        "railway/signal": {
+            "icon": "poi-junction",
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "railway": "signal"
+            },
+            "terms": [
+                "signal",
+                "lights"
+            ],
+            "name": "Railway Signal"
+        },
         "railway/station": {
             "icon": "rail",
             "fields": [
@@ -10517,6 +10563,40 @@
             ],
             "name": "Subway"
         },
+        "railway/switch": {
+            "icon": "poi-junction",
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "railway": "switch"
+            },
+            "terms": [
+                "switch",
+                "points"
+            ],
+            "name": "Railway Switch"
+        },
+        "railway/train_wash": {
+            "icon": "rail",
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "fields": [
+                "operator",
+                "building_area"
+            ],
+            "tags": {
+                "railway": "wash"
+            },
+            "terms": [
+                "wash",
+                "clean"
+            ],
+            "name": "Train Wash"
+        },
         "railway/tram_stop": {
             "icon": "rail-light",
             "fields": [
diff --git a/data/presets/presets/railway/derail.json b/data/presets/presets/railway/derail.json
new file mode 100644
index 0000000000..e243c20ce0
--- /dev/null
+++ b/data/presets/presets/railway/derail.json
@@ -0,0 +1,13 @@
+{
+    "icon": "roadblock",
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "railway": "derail"
+    },
+    "terms": [
+        "derailer"
+    ],
+    "name": "Railway Derailer"
+}
diff --git a/data/presets/presets/railway/milestone.json b/data/presets/presets/railway/milestone.json
new file mode 100644
index 0000000000..58cfa7bbce
--- /dev/null
+++ b/data/presets/presets/railway/milestone.json
@@ -0,0 +1,18 @@
+{
+    "icon": "triangle-stroked",
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "fields": [
+        "milestone_position"
+    ],
+    "tags": {
+        "railway": "milestone"
+    },
+    "terms": [
+        "milestone",
+        "marker"
+    ],
+    "name": "Railway Milestone"
+}
diff --git a/data/presets/presets/railway/signal.json b/data/presets/presets/railway/signal.json
new file mode 100644
index 0000000000..028e4ef459
--- /dev/null
+++ b/data/presets/presets/railway/signal.json
@@ -0,0 +1,15 @@
+{
+    "icon": "poi-junction",
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "railway": "signal"
+    },
+    "terms": [
+        "signal",
+        "lights"
+    ],
+    "name": "Railway Signal"
+}
diff --git a/data/presets/presets/railway/switch.json b/data/presets/presets/railway/switch.json
new file mode 100644
index 0000000000..9de5807189
--- /dev/null
+++ b/data/presets/presets/railway/switch.json
@@ -0,0 +1,14 @@
+{
+    "icon": "poi-junction",
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "railway": "switch"
+    },
+    "terms": [
+        "switch",
+        "points"
+    ],
+    "name": "Railway Switch"
+}
diff --git a/data/presets/presets/railway/train_wash.json b/data/presets/presets/railway/train_wash.json
new file mode 100644
index 0000000000..a5a36febd4
--- /dev/null
+++ b/data/presets/presets/railway/train_wash.json
@@ -0,0 +1,20 @@
+{
+    "icon": "rail",
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "fields": [
+        "operator",
+        "building_area"
+    ],
+    "tags": {
+        "railway": "wash"
+    },
+    "terms": [
+        "wash",
+        "clean"
+    ],
+    "name": "Train Wash"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 245fb91345..0dfc9f114e 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2137,6 +2137,10 @@
             "key": "railway",
             "value": "crossing"
         },
+        {
+            "key": "railway",
+            "value": "derail"
+        },
         {
             "key": "railway",
             "value": "disused"
@@ -2153,6 +2157,10 @@
             "key": "railway",
             "value": "level_crossing"
         },
+        {
+            "key": "railway",
+            "value": "milestone"
+        },
         {
             "key": "railway",
             "value": "monorail"
@@ -2169,6 +2177,10 @@
             "key": "railway",
             "value": "rail"
         },
+        {
+            "key": "railway",
+            "value": "signal"
+        },
         {
             "key": "railway",
             "value": "station"
@@ -2181,6 +2193,14 @@
             "key": "railway",
             "value": "subway"
         },
+        {
+            "key": "railway",
+            "value": "switch"
+        },
+        {
+            "key": "railway",
+            "value": "wash"
+        },
         {
             "key": "railway",
             "value": "tram_stop"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 9d9ec02142..39d7c52c76 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1707,6 +1707,10 @@
                 "maxweight": {
                     "label": "Max Weight"
                 },
+                "milestone_position": {
+                    "label": "Milestone Position",
+                    "placeholder": "Distance to one decimal (123.4)"
+                },
                 "mtb/scale": {
                     "label": "Mountain Biking Difficulty",
                     "placeholder": "0, 1, 2, 3...",
@@ -4404,6 +4408,10 @@
                     "name": "Railway Crossing (Path)",
                     "terms": "crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing"
                 },
+                "railway/derail": {
+                    "name": "Railway Derailer",
+                    "terms": "derailer"
+                },
                 "railway/disused": {
                     "name": "Disused Railway",
                     "terms": ""
@@ -4420,6 +4428,10 @@
                     "name": "Railway Crossing (Road)",
                     "terms": "crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing"
                 },
+                "railway/milestone": {
+                    "name": "Railway Milestone",
+                    "terms": "milestone,marker"
+                },
                 "railway/monorail": {
                     "name": "Monorail",
                     "terms": ""
@@ -4436,6 +4448,10 @@
                     "name": "Rail",
                     "terms": ""
                 },
+                "railway/signal": {
+                    "name": "Railway Signal",
+                    "terms": "signal,lights"
+                },
                 "railway/station": {
                     "name": "Railway Station",
                     "terms": "train station,station"
@@ -4448,6 +4464,14 @@
                     "name": "Subway",
                     "terms": "metro,transit"
                 },
+                "railway/switch": {
+                    "name": "Railway Switch",
+                    "terms": "switch,points"
+                },
+                "railway/train_wash": {
+                    "name": "Train Wash",
+                    "terms": "wash,clean"
+                },
                 "railway/tram_stop": {
                     "name": "Tram Stop",
                     "terms": "light rail,streetcar,tram,trolley"