diff --git a/recipes-phosphor/fans/fan-watchdog/fan-watchdog-monitor@.service b/recipes-phosphor/fans/fan-watchdog/fan-watchdog-monitor@.service
new file mode 100644
index 0000000..945561b
--- /dev/null
+++ b/recipes-phosphor/fans/fan-watchdog/fan-watchdog-monitor@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Fan Watchdog Failure Monitor
+
+#This can get called every time a process dies, so ensure it's never limited
+StartLimitIntervalSec=0
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/env phosphor-unit-failure-monitor --source %i --target obmc-fan-watchdog-takeover.target --action start
+SyslogIdentifier=phosphor-unit-failure-monitor
diff --git a/recipes-phosphor/fans/fan-watchdog/fan-watchdog.service b/recipes-phosphor/fans/fan-watchdog/fan-watchdog.service
new file mode 100644
index 0000000..3f94183
--- /dev/null
+++ b/recipes-phosphor/fans/fan-watchdog/fan-watchdog.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Fan Watchdog Daemon
+Wants=phosphor-fan-monitor-init@0.service
+Before=phosphor-fan-monitor-init@0.service
+Conflicts=obmc-fan-watchdog-takeover.target
+
+[Service]
+EnvironmentFile={envfiledir}/obmc/fan-watchdog/fan-watchdog.conf
+ExecStart=/sbin/watchdog -T ${{TIMEOUT}} -t ${{INTERVAL}} -F ${{DEVICE}}
+KillSignal=SIGKILL
+
+[Install]
+RequiredBy=obmc-chassis-poweron@0.target
diff --git a/recipes-phosphor/fans/fan-watchdog/obmc/fan-watchdog/fan-watchdog.conf b/recipes-phosphor/fans/fan-watchdog/obmc/fan-watchdog/fan-watchdog.conf
new file mode 100644
index 0000000..ce7824c
--- /dev/null
+++ b/recipes-phosphor/fans/fan-watchdog/obmc/fan-watchdog/fan-watchdog.conf
@@ -0,0 +1,3 @@
+TIMEOUT=5
+INTERVAL=1
+DEVICE=/dev/watchdog0
diff --git a/recipes-phosphor/fans/fan-watchdog/obmc/fan-watchdog/reset-fan-watchdog.conf b/recipes-phosphor/fans/fan-watchdog/obmc/fan-watchdog/reset-fan-watchdog.conf
new file mode 100644
index 0000000..b4e5ce7
--- /dev/null
+++ b/recipes-phosphor/fans/fan-watchdog/obmc/fan-watchdog/reset-fan-watchdog.conf
@@ -0,0 +1,4 @@
+GPIO_PATH=/dev/gpiochip0
+GPIO=109
+DELAY=1
+ACTION=low_high
diff --git a/recipes-phosphor/fans/fan-watchdog/reset-fan-watchdog.service b/recipes-phosphor/fans/fan-watchdog/reset-fan-watchdog.service
new file mode 100644
index 0000000..f6248f0
--- /dev/null
+++ b/recipes-phosphor/fans/fan-watchdog/reset-fan-watchdog.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Fan Watchdog Reset
+Wants=phosphor-fan-monitor-init@0.service
+Before=phosphor-fan-monitor-init@0.service
+Conflicts=obmc-chassis-poweroff@0.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+EnvironmentFile={envfiledir}/obmc/fan-watchdog/reset-fan-watchdog.conf
+ExecStart=/usr/bin/env phosphor-gpio-util -p ${{GPIO_PATH}} -g ${{GPIO}} -a ${{ACTION}} -d ${{DELAY}}
+SyslogIdentifier=phosphor-gpio-util