diff --git a/sys/conf/files b/sys/conf/files
index d680535ae0b92e..b2da16980cee83 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2771,7 +2771,6 @@ dev/puc/puc.c			optional puc
 dev/puc/puc_cfg.c		optional puc
 dev/puc/puc_pccard.c		optional puc pccard
 dev/puc/puc_pci.c		optional puc pci
-dev/puc/pucdata.c		optional puc pci
 dev/quicc/quicc_core.c		optional quicc
 dev/ral/rt2560.c		optional ral
 dev/ral/rt2661.c		optional ral
diff --git a/sys/dev/puc/puc_pci.c b/sys/dev/puc/puc_pci.c
index d6b126f0f92bd5..f0c6aa81dde433 100644
--- a/sys/dev/puc/puc_pci.c
+++ b/sys/dev/puc/puc_pci.c
@@ -80,6 +80,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/puc/puc_cfg.h>
 #include <dev/puc/puc_bfe.h>
+#include <dev/puc/pucdata.c>
 
 static int puc_msi_disable;
 SYSCTL_INT(_hw_puc, OID_AUTO, msi_disable, CTLFLAG_RDTUN,
@@ -198,3 +199,5 @@ static driver_t puc_pci_driver = {
 };
 
 DRIVER_MODULE(puc, pci, puc_pci_driver, puc_devclass, 0, 0);
+MODULE_PNP_INFO("U16:vendor;U16:device;U16:#;U16:#;D:#", pci, puc,
+    puc_pci_devices, sizeof(puc_pci_devices[0]), nitems(puc_pci_devices) - 1);
diff --git a/sys/modules/puc/Makefile b/sys/modules/puc/Makefile
index 042ae102abef34..882e3334306725 100644
--- a/sys/modules/puc/Makefile
+++ b/sys/modules/puc/Makefile
@@ -4,7 +4,7 @@
 .PATH:	${SRCTOP}/sys/dev/puc
 
 KMOD=	puc
-SRCS=	puc.c puc_cfg.c puc_pci.c puc_pccard.c pucdata.c
+SRCS=	puc.c puc_cfg.c puc_pci.c puc_pccard.c
 SRCS+=	bus_if.h device_if.h serdev_if.c serdev_if.h \
 	card_if.h pci_if.h