diff --git a/recipes-bsp/watchdog/watchdog-5.9/init b/recipes-bsp/watchdog/watchdog/init
similarity index 100%
rename from recipes-bsp/watchdog/watchdog-5.9/init
rename to recipes-bsp/watchdog/watchdog/init
diff --git a/recipes-bsp/watchdog/watchdog-5.9/sysmobts-v1/watchdog.conf b/recipes-bsp/watchdog/watchdog/sysmobts-v1/watchdog.conf
similarity index 100%
rename from recipes-bsp/watchdog/watchdog-5.9/sysmobts-v1/watchdog.conf
rename to recipes-bsp/watchdog/watchdog/sysmobts-v1/watchdog.conf
diff --git a/recipes-bsp/watchdog/watchdog-5.9/sysmobts-v2/watchdog.conf b/recipes-bsp/watchdog/watchdog/sysmobts-v2/watchdog.conf
similarity index 100%
rename from recipes-bsp/watchdog/watchdog-5.9/sysmobts-v2/watchdog.conf
rename to recipes-bsp/watchdog/watchdog/sysmobts-v2/watchdog.conf
diff --git a/recipes-bsp/watchdog/watchdog_5.12.bbappend b/recipes-bsp/watchdog/watchdog_5.12.bbappend
new file mode 100644
index 0000000..4b70c90
--- /dev/null
+++ b/recipes-bsp/watchdog/watchdog_5.12.bbappend
@@ -0,0 +1 @@
+require ${PN}_sysmocom.inc
diff --git a/recipes-bsp/watchdog/watchdog_5.9.bbappend b/recipes-bsp/watchdog/watchdog_5.9.bbappend
index 906dead..4b70c90 100644
--- a/recipes-bsp/watchdog/watchdog_5.9.bbappend
+++ b/recipes-bsp/watchdog/watchdog_5.9.bbappend
@@ -1,25 +1 @@
-SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:"
-PRINC = "6"
-
-inherit update-rc.d
-
-SRC_URI_append_sysmobts-v1 = " file://watchdog.conf file://init"
-SRC_URI_append_sysmobts-v2 = " file://watchdog.conf file://init"
-
-do_install_append() {
-
-	if [ -e ${WORKDIR}/watchdog.conf ]; then
-		install -D -m 0644 ${WORKDIR}/watchdog.conf ${D}/${sysconfdir}/
-	fi
-
-	install -D -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/watchdog
-}
-
-CONFFILES_${PN} = "${sysconfdir}/watchdog.conf"
-INITSCRIPT_PACKAGES = "${PN}"
-INITSCRIPT_NAME_${PN} = "watchdog"
-INITSCRIPT_PARAMS_${PN} = "start 06 S ."
-
-# bug in poky meta/classes/base.bbclass?
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+require ${PN}_sysmocom.inc
diff --git a/recipes-bsp/watchdog/watchdog_sysmocom.inc b/recipes-bsp/watchdog/watchdog_sysmocom.inc
new file mode 100644
index 0000000..dcfbdb6
--- /dev/null
+++ b/recipes-bsp/watchdog/watchdog_sysmocom.inc
@@ -0,0 +1,25 @@
+SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}"
+PRINC = "6"
+
+inherit update-rc.d
+
+SRC_URI_append_sysmobts-v1 = " file://watchdog.conf file://init"
+SRC_URI_append_sysmobts-v2 = " file://watchdog.conf file://init"
+
+do_install_append() {
+
+	if [ -e ${WORKDIR}/watchdog.conf ]; then
+		install -D -m 0644 ${WORKDIR}/watchdog.conf ${D}/${sysconfdir}/
+	fi
+
+	install -D -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/watchdog
+}
+
+CONFFILES_${PN} = "${sysconfdir}/watchdog.conf"
+INITSCRIPT_PACKAGES = "${PN}"
+INITSCRIPT_NAME_${PN} = "watchdog"
+INITSCRIPT_PARAMS_${PN} = "start 06 S ."
+
+# bug in poky meta/classes/base.bbclass?
+PACKAGE_ARCH = "${MACHINE_ARCH}"