diff --git a/recipes-core/systemd/systemd-conf.bbappend b/recipes-core/systemd/systemd-conf.bbappend
new file mode 100644
index 0000000..2f2012b
--- /dev/null
+++ b/recipes-core/systemd/systemd-conf.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_prepend_stm32mpcommon := "${THISDIR}/${PN}:"
+
+SRC_URI_append_stm32mpcommon = " \
+    file://0001-Enable-hardware-watchdog-inside-systemd.patch \
+    "
diff --git a/recipes-core/systemd/systemd-conf/0001-Enable-hardware-watchdog-inside-systemd.patch b/recipes-core/systemd/systemd-conf/0001-Enable-hardware-watchdog-inside-systemd.patch
new file mode 100644
index 0000000..5359a5f
--- /dev/null
+++ b/recipes-core/systemd/systemd-conf/0001-Enable-hardware-watchdog-inside-systemd.patch
@@ -0,0 +1,27 @@
+From 00d191a63ebc27ba5bc9f796f6dc7843e4a8d379 Mon Sep 17 00:00:00 2001
+From: christophe montaud <christophe.montaud@st.com>
+Date: Wed, 16 May 2018 13:50:17 +0200
+Subject: [PATCH] Enable hardware watchdog inside systemd
+
+---
+ src/core/system.conf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/system.conf.in b/src/core/system.conf.in
+index f0a59a7..e5f5aaa 100644
+--- a/src/core/system.conf.in
++++ b/src/core/system.conf.in
+@@ -24,8 +24,8 @@
+ #CtrlAltDelBurstAction=reboot-force
+ #CPUAffinity=1 2
+ #JoinControllers=cpu,cpuacct net_cls,net_prio
+-#RuntimeWatchdogSec=0
+-#ShutdownWatchdogSec=10min
++RuntimeWatchdogSec=30
++ShutdownWatchdogSec=5min
+ #CapabilityBoundingSet=
+ #NoNewPrivileges=no
+ #SystemCallArchitectures=
+-- 
+2.7.4
+