diff --git a/sys/arm/freescale/imx/imx_wdog.c b/sys/arm/freescale/imx/imx_wdog.c
index 825e95766e8e..8263e932ff7c 100644
--- a/sys/arm/freescale/imx/imx_wdog.c
+++ b/sys/arm/freescale/imx/imx_wdog.c
@@ -209,6 +209,13 @@ imx_wdog_attach(device_t dev)
 		sc->sc_pde_enabled = true;
 
 	EVENTHANDLER_REGISTER(watchdog_list, imx_watchdog, sc, 0);
+
+	/*
+	 * The watchdog hardware cannot be disabled, so there's little point in
+	 * coding up a detach() routine to carefully tear everything down, just
+	 * make the device busy so that detach can't happen.
+	 */
+	device_busy(sc->sc_dev);
 	return (0);
 }
 
@@ -227,3 +234,4 @@ static driver_t imx_wdog_driver = {
 static devclass_t imx_wdog_devclass;
 
 DRIVER_MODULE(imx_wdog, simplebus, imx_wdog_driver, imx_wdog_devclass, 0, 0);
+SIMPLEBUS_PNP_INFO(compat_data);
diff --git a/sys/modules/imx/Makefile b/sys/modules/imx/Makefile
index b20cb7a01490..75cb283c78dc 100644
--- a/sys/modules/imx/Makefile
+++ b/sys/modules/imx/Makefile
@@ -5,5 +5,6 @@ SUBDIR = \
 	../ffec \
 	imx_i2c \
 	imx_spi \
+	imx_wdog \
 	
 .include <bsd.subdir.mk>
diff --git a/sys/modules/imx/imx_wdog/Makefile b/sys/modules/imx/imx_wdog/Makefile
new file mode 100644
index 000000000000..93e28c74e8ef
--- /dev/null
+++ b/sys/modules/imx/imx_wdog/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.PATH: ${SRCTOP}/sys/arm/freescale/imx
+
+KMOD=	imx_wdog
+SRCS=	imx_wdog.c
+
+# Generated files...
+SRCS+=	\
+	bus_if.h \
+	device_if.h \
+	ofw_bus_if.h \
+
+.include <bsd.kmod.mk>