diff --git a/recipes-phosphor/host/op-host-control/start_host@.service b/recipes-phosphor/host/op-host-control/start_host@.service
index 77a88e8..825275a 100644
--- a/recipes-phosphor/host/op-host-control/start_host@.service
+++ b/recipes-phosphor/host/op-host-control/start_host@.service
@@ -8,6 +8,7 @@
 After=obmc-power-on@%i.target
 Conflicts=obmc-host-stop@%i.target
 ConditionPathExists=!/run/openbmc/host@%i-on
+ConditionPathExists=!/run/openbmc/mpreboot@%i
 
 [Service]
 ExecStart=/usr/bin/env openpower-proc-control startHost
diff --git a/recipes-phosphor/host/op-proc-control-systemd-links.bb b/recipes-phosphor/host/op-proc-control-systemd-links.bb
index 8185ddf..46fdbbc 100644
--- a/recipes-phosphor/host/op-proc-control-systemd-links.bb
+++ b/recipes-phosphor/host/op-proc-control-systemd-links.bb
@@ -14,6 +14,8 @@
 pkg_postinst_${PN}() {
 	mkdir -p $D$systemd_system_unitdir/obmc-host-stop@0.target.wants
 	mkdir -p $D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires
+	mkdir -p $D$systemd_system_unitdir/obmc-host-startmin@0.target.requires
+	mkdir -p $D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires
 
 	LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.wants/op-stop-instructions@0.service"
 	TARGET="../op-stop-instructions@.service"
@@ -30,6 +32,14 @@
 		TARGET="../cfam_override@.service"
 		ln -s $TARGET $LINK
 	fi
+
+	LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/op-continue-mpreboot@0.service"
+	TARGET="../op-continue-mpreboot@.service"
+	ln -s $TARGET $LINK
+
+	LINK="$D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires/op-enter-mpreboot@0.service"
+	TARGET="../op-enter-mpreboot@.service"
+	ln -s $TARGET $LINK
 }
 
 pkg_prerm_${PN}() {
@@ -42,4 +52,8 @@
 		LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/cfam_override@0.service"
 		rm $LINK
 	fi
+	LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/op-continue-mpreboot@0.service"
+	rm $LINK
+	LINK="$D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires/op-enter-mpreboot@0.service"
+	rm $LINK
 }
diff --git a/recipes-phosphor/host/op-proc-control_git.bb b/recipes-phosphor/host/op-proc-control_git.bb
index 01ef6b0..1ede402 100644
--- a/recipes-phosphor/host/op-proc-control_git.bb
+++ b/recipes-phosphor/host/op-proc-control_git.bb
@@ -11,7 +11,7 @@
 inherit systemd
 
 SRC_URI += "git://github.com/openbmc/openpower-proc-control"
-SRCREV = "7847960506ca4357e267fe05866b38aad236708f"
+SRCREV = "aefde6902507add3891557f2b9de5d407cfadb1e"
 
 DEPENDS += " \
         autoconf-archive-native \
@@ -34,4 +34,6 @@
                          op-stop-instructions@.service \
                          op-cfam-reset.service \
                          ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'set-spi-mux.service', '', d)} \
+                         op-continue-mpreboot@.service \
+                         op-enter-mpreboot@.service \
                          "