diff --git a/source/_docs/mqtt/discovery.markdown b/source/_docs/mqtt/discovery.markdown
index cdee9b31d7e..ee7d983aba4 100644
--- a/source/_docs/mqtt/discovery.markdown
+++ b/source/_docs/mqtt/discovery.markdown
@@ -155,6 +155,7 @@ Supported abbreviations:
     'pl':                  'payload',
     'pl_arm_away':         'payload_arm_away',
     'pl_arm_home':         'payload_arm_home',
+    'pl_arm_custom_b':     'payload_arm_custom_bypass',
     'pl_arm_nite':         'payload_arm_night',
     'pl_avail':            'payload_available',
     'pl_cln_sp':           'payload_clean_spot',
diff --git a/source/_integrations/alarm_control_panel.mqtt.markdown b/source/_integrations/alarm_control_panel.mqtt.markdown
index 0f5fee56b7d..ba3583c8448 100644
--- a/source/_integrations/alarm_control_panel.mqtt.markdown
+++ b/source/_integrations/alarm_control_panel.mqtt.markdown
@@ -16,8 +16,11 @@ The integration will accept the following states from your Alarm Panel (in lower
 - `armed_home`
 - `armed_away`
 - `armed_night`
+- `armed_custom_bypass`
 - `pending`
 - `triggered`
+- `arming`
+- `disarming`
 
 The integration can control your Alarm Panel by publishing to the `command_topic` when a user interacts with the Home Assistant frontend.
 
@@ -118,6 +121,11 @@ payload_arm_night:
   required: false
   type: string
   default: ARM_NIGHT
+payload_arm_custom_bypass:
+  description: The payload to set armed-custom-bypass mode on your Alarm Panel.
+  required: false
+  type: string
+  default: ARM_CUSTOM_BYPASS
 payload_available:
   description: The payload that represents the available state.
   required: false