diff --git a/dsdl/uavcan/equipment/safety/749.ArmingStatus.uavcan b/dsdl/uavcan/equipment/safety/749.ArmingStatus.uavcan
new file mode 100644
index 0000000000..759b5d8c65
--- /dev/null
+++ b/dsdl/uavcan/equipment/safety/749.ArmingStatus.uavcan
@@ -0,0 +1,9 @@
+#
+# This message represents the system arming status.
+# Some nodes may refuse to operate unless the system is fully armed.
+#
+
+uint8 STATUS_DISARMED           = 0
+uint8 STATUS_FULLY_ARMED        = 255
+
+uint8 status
diff --git a/dsdl/uavcan/equipment/safety/749.MasterSwitchStatus.uavcan b/dsdl/uavcan/equipment/safety/749.MasterSwitchStatus.uavcan
deleted file mode 100644
index 5e5f873f8d..0000000000
--- a/dsdl/uavcan/equipment/safety/749.MasterSwitchStatus.uavcan
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Some nodes may refuse to operate unless some other node publishes this message with correct value.
-#
-
-bool enable