diff --git a/common/recipes-kernel/linux/linux-obmc.inc b/common/recipes-kernel/linux/linux-obmc.inc
index 271f325..274db26 100644
--- a/common/recipes-kernel/linux/linux-obmc.inc
+++ b/common/recipes-kernel/linux/linux-obmc.inc
@@ -12,6 +12,8 @@
 SRC_URI += "file://phosphor-gpio-keys.cfg"
 SRC_URI += "file://phosphor-vlan.scc"
 SRC_URI += "file://phosphor-vlan.cfg"
+SRC_URI += "file://phosphor-wdt-on-panic.scc"
+SRC_URI += "file://phosphor-wdt-on-panic.cfg"
 SRC_URI_append_df-obmc-ubi-fs = " file://0001-ARM-dts-Aspeed-Witherspoon-Update-BMC-partitioning.patch"
 
 
diff --git a/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.cfg b/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.cfg
new file mode 100644
index 0000000..329b4df
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.cfg
@@ -0,0 +1,2 @@
+CONFIG_PANIC_ON_OOPS=y
+CONFIG_PANIC_TIMEOUT=0
diff --git a/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.scc b/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.scc
new file mode 100644
index 0000000..7fc6507
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-obmc/phosphor-wdt-on-panic.scc
@@ -0,0 +1,2 @@
+define KFEATURE_DESCRIPTION "Require watchdog to reset SoC on panic"
+kconf non-hardware phosphor-wdt-on-panic.cfg