diff --git a/meta-sysmocom-bsp/recipes-extra/gpsdate/gpsdate_git.bb b/meta-sysmocom-bsp/recipes-extra/gpsdate/gpsdate_git.bb
index 9e3f7df81c..753d9ba57f 100644
--- a/meta-sysmocom-bsp/recipes-extra/gpsdate/gpsdate_git.bb
+++ b/meta-sysmocom-bsp/recipes-extra/gpsdate/gpsdate_git.bb
@@ -6,13 +6,13 @@ DEPENDS = "gpsd"
 RDEPENDS_${PN} = "libgps"
 
 PE = "1"
-PR = "r11"
+PR = "r13"
 PV = "0.2+git${SRCPV}"
 
 SRC_URI = "git://git.sysmocom.de/gpsdate.git;branch=master \
 	file://gpsdate.default \
 "
-SRCREV = "cb50b4bb9fd30ed64a8ea5791126f8ce7518ba3a"
+SRCREV = "8c0f608643504b14c42ecb0d436354fad3cc7929"
 S = "${WORKDIR}/git"
 
 INITSCRIPT_NAME = "gpsdate"
@@ -23,6 +23,7 @@ inherit update-rc.d
 do_install() {
     install -d ${D}/${sbindir}
     install -m 0755 ${S}/gpsdate ${D}/${sbindir}/gpsdate
+    install -m 0755 ${S}/gps-watchdog ${D}/${sbindir}/gps-watchdog
     install -d ${D}/${sysconfdir}/init.d
     install -m 0755 ${S}/gpsdate.init ${D}/${sysconfdir}/init.d/gpsdate
 
@@ -37,3 +38,7 @@ do_install() {
 }
 
 FILES_${PN} += "${systemd_unitdir}"
+
+PACKAGES =+ "gps-watchdog"
+
+FILES_gps-watchdog = "${sbindir}/gps-watchdog"
diff --git a/meta-sysmocom-bsp/recipes-extra/python/python-smbus_3.1.1.bb b/meta-sysmocom-bsp/recipes-extra/python/python-smbus_3.1.1.bb
new file mode 100644
index 0000000000..df47df6248
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-extra/python/python-smbus_3.1.1.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Set of i2c tools for linux - Python module"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://smbusmodule.c;startline=1;endline=17;md5=fa24df321a520ff8e10f203425ab9fa8"
+
+SRC_URI = "http://dl.lm-sensors.org/i2c-tools/releases/i2c-tools-${PV}.tar.bz2 \
+"
+SRC_URI[md5sum] = "0fdbff53ebd0b8d9249256d6c56480b1"
+SRC_URI[sha256sum] = "14d4d7d60d1c12e43f2befe239c682a5c44c27682f153d4b58c1e392d2db1700"
+
+DEPENDS = "i2c-tools"
+
+inherit distutils
+
+S = "${WORKDIR}/i2c-tools-${PV}/py-smbus/"
+
+do_configure_prepend() {
+    # Adjust for OE header rename
+    sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: Module.mk
+    sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: smbusmodule.c
+}