diff --git a/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc b/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc
index 1ec65d2..6c12da8 100644
--- a/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc
+++ b/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc
@@ -77,6 +77,11 @@
     LINK="$D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires/obmc-host-force-warm-reboot@0.target"
     TARGET="../obmc-host-force-warm-reboot@.target"
     ln -s $TARGET $LINK
+
+    mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants
+    LINK="$D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants/phosphor-clear-one-time@0.service"
+    TARGET="../phosphor-clear-one-time@.service"
+    ln -s $TARGET $LINK
 }
 
 pkg_prerm_${PN}-obmc-targets_append() {
@@ -131,4 +136,7 @@
 
     LINK="$D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires/obmc-host-force-warm-reboot@0.target"
     rm $LINK
+
+    LINK="$D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants/phosphor-clear-one-time@0.service"
+    rm $LINK
 }
diff --git a/recipes-phosphor/state/phosphor-state-manager_git.bb b/recipes-phosphor/state/phosphor-state-manager_git.bb
index 5d2357e..4c9978b 100644
--- a/recipes-phosphor/state/phosphor-state-manager_git.bb
+++ b/recipes-phosphor/state/phosphor-state-manager_git.bb
@@ -58,6 +58,7 @@
 DBUS_SERVICE_${PN}-host += "xyz.openbmc_project.State.Host.service"
 DBUS_SERVICE_${PN}-host += "phosphor-reboot-host@.service"
 SYSTEMD_SERVICE_${PN}-host += "phosphor-reset-host-reboot-attempts@.service"
+SYSTEMD_SERVICE_${PN}-host += "phosphor-clear-one-time@.service"
 
 FILES_${PN}-chassis = "${bindir}/phosphor-chassis-state-manager"
 DBUS_SERVICE_${PN}-chassis += "xyz.openbmc_project.State.Chassis.service"
@@ -173,6 +174,6 @@
 SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}"
 
 SRC_URI += "git://github.com/openbmc/phosphor-state-manager"
-SRCREV = "162c7bfb0cbedcc5ccaf74c773da5a7c81fef8b1"
+SRCREV = "3191be88af4df13e19ec6c37679e92e0ed4e6080"
 
 S = "${WORKDIR}/git"