diff --git a/obmcutil b/obmcutil
index 6cfdee5..64945b6 100755
--- a/obmcutil
+++ b/obmcutil
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 OPTS="bmcstate,bootprogress,chassiskill,chassisoff,chassison,chassisstate,hoststate,\
-osstate,power,poweroff,poweron,state,status,rebootoff,rebooton"
+osstate,power,poweroff,poweron,state,status,rebootoff,rebooton,recoveryoff,recoveryon"
 
 USAGE="Usage: obmcutil [-h] [--wait] [--verbose]
                 {$OPTS}"
@@ -16,6 +16,8 @@
 STATE_OBJECT=$OBJECT_ROOT/state
 CONTROL_OBJECT=$OBJECT_ROOT/control
 
+HOST_TIMEOUT_TARGET=obmc-host-timeout@0.target
+
 ## NOTE: The following global variables are used only in the run_timeout cmd.
 ## By declaring these globally instead of passing them through the
 ## intermediary functions, which may not be "best practice", the readability
@@ -47,6 +49,11 @@
     echo "obmcutil rebootoff    Disable auto reboot from Quiesce state"
     echo "obmcutil rebooton     Enable auto reboot from Quiesce state"
     echo ""
+    echo "obmcutil recoveryoff  Disable boot watchdog timeout handling and"
+    echo "                      disable auto reboot from Quiesce state"
+    echo "obmcutil recoveryon   Enable boot watchdog timeout handling and"
+    echo "                      enable auto reboot from Quiesce state"
+    echo ""
     echo "optional arguments:"
     echo "  -h, --help          show this help message and exit"
     echo "  -w, --wait          block until state transition succeeds or fails"
@@ -132,6 +139,18 @@
     exit 1
 }
 
+mask_systemd_target ()
+{
+    target="$@"
+    systemctl mask $target
+}
+
+unmask_systemd_target ()
+{
+    target="$@"
+    systemctl unmask $target
+}
+
 handle_cmd ()
 {
     case "$1" in
@@ -250,6 +269,14 @@
             VALUE=true
             set_property $SERVICE $OBJECT $INTERFACE $PROPERTY "b" $VALUE
             ;;
+        recoveryoff)
+            handle_cmd rebootoff
+            mask_systemd_target $HOST_TIMEOUT_TARGET
+            ;;
+        recoveryon)
+            handle_cmd rebooton
+            unmask_systemd_target $HOST_TIMEOUT_TARGET
+            ;;
         *)
             print_usage_err "Invalid command '$1'"
             ;;