diff --git a/br-ext-chip-xiongmai/board/xm510/xm510.generic.config b/br-ext-chip-xiongmai/board/xm510/xm510.generic.config
index 130d27c055..108396275b 100644
--- a/br-ext-chip-xiongmai/board/xm510/xm510.generic.config
+++ b/br-ext-chip-xiongmai/board/xm510/xm510.generic.config
@@ -791,7 +791,15 @@ CONFIG_GPIO_XM510=y
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_ARM_SP805_WATCHDOG=y
+# CONFIG_MAX63XX_WATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 
 #
diff --git a/br-ext-chip-xiongmai/board/xm530/xm530.generic.config b/br-ext-chip-xiongmai/board/xm530/xm530.generic.config
index c6e474870d..c1b71dd2f6 100644
--- a/br-ext-chip-xiongmai/board/xm530/xm530.generic.config
+++ b/br-ext-chip-xiongmai/board/xm530/xm530.generic.config
@@ -979,7 +979,23 @@ CONFIG_GPIO_XM530=y
 # CONFIG_POWER_AVS is not set
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_ARM_SP805_WATCHDOG=y
+# CONFIG_DW_WATCHDOG is not set
+# CONFIG_MPCORE_WATCHDOG is not set
+# CONFIG_MAX63XX_WATCHDOG is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
 CONFIG_SSB_POSSIBLE=y
 
 #
diff --git a/general/package/xiongmai-osdrv-xm510/files/kmod/xm_wdt.ko b/general/package/xiongmai-osdrv-xm510/files/kmod/xm_wdt.ko
deleted file mode 100644
index 719761c8f0..0000000000
Binary files a/general/package/xiongmai-osdrv-xm510/files/kmod/xm_wdt.ko and /dev/null differ
diff --git a/general/package/xiongmai-osdrv-xm510/files/script/load_xiongmai b/general/package/xiongmai-osdrv-xm510/files/script/load_xiongmai
index cfbdd49b71..7578f03f5e 100755
--- a/general/package/xiongmai-osdrv-xm510/files/script/load_xiongmai
+++ b/general/package/xiongmai-osdrv-xm510/files/script/load_xiongmai
@@ -89,7 +89,8 @@ insert_ko()
 	insmod xm510_rgn.ko
 	insmod xm510_h264.ko
 	insmod xm_rtc.ko
-	# insmod xm_wdt.ko
+	# The watchdog is the kernel's sp805_wdt (/dev/watchdog), not xm_wdt.ko: see
+	# OpenIPC/firmware#2611.
 
 	#insert_audio
 	echo "==== Your input Sensor type is $SNS_A ===="
@@ -98,7 +99,6 @@ insert_ko()
 remove_ko()
 {
 	#remove_audio
-	rmmod -w xm_wdt
 	rmmod -w xm_rtc
 	rmmod -w xm510_h264
 	rmmod -w xm510_rgn
diff --git a/general/package/xiongmai-osdrv-xm510/files/script/loadxm510_64M b/general/package/xiongmai-osdrv-xm510/files/script/loadxm510_64M
index a4e8e75d73..9666cf267a 100755
--- a/general/package/xiongmai-osdrv-xm510/files/script/loadxm510_64M
+++ b/general/package/xiongmai-osdrv-xm510/files/script/loadxm510_64M
@@ -82,7 +82,8 @@ insert_ko()
 		insmod xm510_rgn.ko
 		insmod xm510_h264.ko
 		insmod xm_rtc.ko
-		insmod xm_wdt.ko
+		# The watchdog is the kernel's sp805_wdt (/dev/watchdog), not xm_wdt.ko: see
+		# OpenIPC/firmware#2611.
 
 		#insert_audio
 		echo "==== Your input Sensor type is $SNS_A ===="
@@ -91,7 +92,6 @@ insert_ko()
 remove_ko()
 {
 	remove_audio
-	rmmod -w xm_wdt
 	rmmod -w xm_rtc
 	rmmod -w xm510_h264
 	rmmod -w xm510_rgn
diff --git a/general/package/xiongmai-osdrv-xm530/files/kmod/Readme.txt b/general/package/xiongmai-osdrv-xm530/files/kmod/Readme.txt
index d7cbda7d25..6347dc5aa0 100644
--- a/general/package/xiongmai-osdrv-xm530/files/kmod/Readme.txt
+++ b/general/package/xiongmai-osdrv-xm530/files/kmod/Readme.txt
@@ -19,8 +19,7 @@
 |   |-- xm530_vo.ko
 |   |-- xm_i2c.ko
 |   |-- xm_i2s.ko
-|   |-- xm_rtc.ko
-|   `-- xm_wdt.ko
+|   `-- xm_rtc.ko
 |-- readme.txt
 |-- rtl8188 
 |   |-- 8188eu.ko
diff --git a/general/package/xiongmai-osdrv-xm530/files/kmod/xm_wdt.ko b/general/package/xiongmai-osdrv-xm530/files/kmod/xm_wdt.ko
deleted file mode 100644
index 5bb0c44492..0000000000
Binary files a/general/package/xiongmai-osdrv-xm530/files/kmod/xm_wdt.ko and /dev/null differ
diff --git a/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai b/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai
index bfb855161c..8ebb1d2c73 100755
--- a/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai
+++ b/general/package/xiongmai-osdrv-xm530/files/script/load_xiongmai
@@ -72,7 +72,8 @@ insert_ko() {
 	insmod xm530_rgn.ko
 	insmod xm530_h264.ko
 	insmod xm_rtc.ko
-	insmod xm_wdt.ko
+	# The watchdog is the kernel's sp805_wdt (/dev/watchdog), not xm_wdt.ko: see
+	# OpenIPC/firmware#2611.
 	insmod log.ko
 	insert_audio
 	insert_h265
@@ -81,7 +82,6 @@ insert_ko() {
 
 remove_ko() {
 	remove_audio
-	rmmod -w xm_wdt
 	rmmod -w xm_rtc
 	rmmod -w xm530_h264
 	rmmod -w xm530_rgn