diff --git a/data/fields/crossing/whistle_optional.json b/data/fields/crossing/whistle_optional.json
new file mode 100644
index 00000000..a9a397e4
--- /dev/null
+++ b/data/fields/crossing/whistle_optional.json
@@ -0,0 +1,19 @@
+{
+    "key": "crossing:whistle",
+    "type": "combo",
+    "label": "Train Horn",
+    "placeholder": "Only as Needed",
+    "strings": {
+        "options": {
+            "yes": "Mandatory",
+            "wayside": "Wayside/Stationary Horn"
+        }
+    },
+    "autoSuggestions": false,
+    "customValues": false,
+    "locationSet": {
+        "include": [
+            "150"
+        ]
+    }
+}
diff --git a/data/fields/crossing/whistle_yes.json b/data/fields/crossing/whistle_yes.json
new file mode 100644
index 00000000..614f6fab
--- /dev/null
+++ b/data/fields/crossing/whistle_yes.json
@@ -0,0 +1,20 @@
+{
+    "key": "crossing:whistle",
+    "type": "combo",
+    "label": "Train Horn",
+    "placeholder": "Mandatory",
+    "strings": {
+        "options": {
+            "optional": "Only as Needed",
+            "wayside": "Wayside/Stationary Horn"
+        }
+    },
+    "autoSuggestions": false,
+    "customValues": false,
+    "locationSet": {
+        "include": [
+            "ca",
+            "us"
+        ]
+    }
+}
diff --git a/data/presets/railway/crossing.json b/data/presets/railway/crossing.json
index 895d2544..b9cfa3ef 100644
--- a/data/presets/railway/crossing.json
+++ b/data/presets/railway/crossing.json
@@ -7,7 +7,9 @@
         "crossing/light"
     ],
     "moreFields": [
-        "crossing/markings"
+        "crossing/markings",
+        "crossing/whistle_optional",
+        "crossing/whistle_yes"
     ],
     "geometry": [
         "vertex"
diff --git a/data/presets/railway/level_crossing.json b/data/presets/railway/level_crossing.json
index 7ed06182..7ecf47ae 100644
--- a/data/presets/railway/level_crossing.json
+++ b/data/presets/railway/level_crossing.json
@@ -5,6 +5,10 @@
         "crossing/bell",
         "crossing/light"
     ],
+    "moreFields": [
+        "crossing/whistle_optional",
+        "crossing/whistle_yes"
+    ],
     "geometry": [
         "vertex"
     ],