diff --git a/sys/modules/bhnd/Makefile b/sys/modules/bhnd/Makefile
new file mode 100644
index 000000000000..c2456a07ecb5
--- /dev/null
+++ b/sys/modules/bhnd/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../dev/bhnd
+
+KMOD=	bhnd
+SRCS=	bhnd.c bhnd_subr.c \
+	bhnd_bus_if.c bhnd_bus_if.h
+
+SRCS+=	device_if.h bus_if.h
+
+SUBDIR=	bcma \
+	bcma_bhndb \
+	bhndb \
+	bhndb_pci \
+	cores \
+	nvram \
+	siba \
+	siba_bhndb
+
+.include <bsd.kmod.mk>
+.include <bsd.subdir.mk>
diff --git a/sys/modules/bhnd/bcma/Makefile b/sys/modules/bhnd/bcma/Makefile
new file mode 100644
index 000000000000..7071d859ab6f
--- /dev/null
+++ b/sys/modules/bhnd/bcma/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../../dev/bhnd/bcma
+
+KMOD=	bcma
+SRCS=	bcma.c bcma_subr.c bcma_erom.c
+
+SRCS+=	device_if.h bus_if.h bhnd_bus_if.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/bhnd/bcma_bhndb/Makefile b/sys/modules/bhnd/bcma_bhndb/Makefile
new file mode 100644
index 000000000000..5896703e666d
--- /dev/null
+++ b/sys/modules/bhnd/bcma_bhndb/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../../dev/bhnd/bcma
+
+KMOD=	bcma_bhndb
+SRCS=	bcma_bhndb.c
+
+SRCS+=	bhnd_bus_if.h bhndb_if.h
+SRCS+=	device_if.h bus_if.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/bhnd/bhndb/Makefile b/sys/modules/bhnd/bhndb/Makefile
new file mode 100644
index 000000000000..a4149371016c
--- /dev/null
+++ b/sys/modules/bhnd/bhndb/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../dev/bhnd/bhndb
+
+KMOD=	bhndb
+SRCS=	bhndb.c bhndb_subr.c bhndb_hwdata.c \
+	bhndb_bus_if.c bhndb_bus_if.h \
+	bhndb_if.c bhndb_if.h
+
+SRCS+=	device_if.h bus_if.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/bhnd/bhndb_pci/Makefile b/sys/modules/bhnd/bhndb_pci/Makefile
new file mode 100644
index 000000000000..a327aa5c3f14
--- /dev/null
+++ b/sys/modules/bhnd/bhndb_pci/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../dev/bhnd/bhndb
+
+KMOD=	bhndb_pci
+SRCS=	bhndb_pci.c bhndb_pci_hwdata.c
+SRCS+=	bhnd_bus_if.h bhndb_bus_if.h bhndb_if.h
+
+SRCS+=	device_if.h bus_if.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/bhnd/cores/Makefile b/sys/modules/bhnd/cores/Makefile
new file mode 100644
index 000000000000..cc45dfbe168f
--- /dev/null
+++ b/sys/modules/bhnd/cores/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+SUBDIR=	bhnd_chipc \
+	bhnd_pci \
+	bhnd_pci_hostb \
+	bhnd_pcib
+
+.include <bsd.subdir.mk>
diff --git a/sys/modules/bhnd/cores/bhnd_chipc/Makefile b/sys/modules/bhnd/cores/bhnd_chipc/Makefile
new file mode 100644
index 000000000000..d35409df2ab5
--- /dev/null
+++ b/sys/modules/bhnd/cores/bhnd_chipc/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../../dev/bhnd/cores/chipc
+
+KMOD=	bhnd_chipc
+SRCS=	chipc.c	\
+	bhnd_chipc_if.c bhnd_chipc_if.h
+SRCS+=	device_if.h bus_if.h bhnd_bus_if.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/bhnd/cores/bhnd_pci/Makefile b/sys/modules/bhnd/cores/bhnd_pci/Makefile
new file mode 100644
index 000000000000..c8dfbef2191d
--- /dev/null
+++ b/sys/modules/bhnd/cores/bhnd_pci/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../../dev/bhnd/cores/pci
+
+KMOD=	bhnd_pci
+SRCS=	bhnd_pci.c \
+	mdio_pcie.c
+SRCS+=	device_if.h bus_if.h bhnd_bus_if.h \
+	mdio_if.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile b/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile
new file mode 100644
index 000000000000..d7597affdf2b
--- /dev/null
+++ b/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../../dev/bhnd/cores/pci
+
+KMOD=	bhnd_pci_hostb
+SRCS=	bhnd_pci_hostb.c
+SRCS+=	device_if.h bus_if.h bhnd_bus_if.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/bhnd/cores/bhnd_pcib/Makefile b/sys/modules/bhnd/cores/bhnd_pcib/Makefile
new file mode 100644
index 000000000000..3e23177e9a5a
--- /dev/null
+++ b/sys/modules/bhnd/cores/bhnd_pcib/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../../dev/bhnd/cores/pci
+
+KMOD=	bhnd_pcib
+SRCS=	bhnd_pcib.c
+SRCS+=	device_if.h bus_if.h bhnd_bus_if.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/bhnd/nvram/Makefile b/sys/modules/bhnd/nvram/Makefile
new file mode 100644
index 000000000000..f85502c668e0
--- /dev/null
+++ b/sys/modules/bhnd/nvram/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../dev/bhnd/nvram
+
+KMOD=	bhnd_nvram
+SRCS=	bhnd_nvram_if.c bhnd_nvram_if.h
+
+SRCS+=	device_if.h bus_if.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/bhnd/siba/Makefile b/sys/modules/bhnd/siba/Makefile
new file mode 100644
index 000000000000..8ace993c04b6
--- /dev/null
+++ b/sys/modules/bhnd/siba/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../../dev/bhnd/siba
+
+KMOD=	siba
+SRCS=	siba.c siba_subr.c
+
+SRCS+=	device_if.h bus_if.h bhnd_bus_if.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/bhnd/siba_bhndb/Makefile b/sys/modules/bhnd/siba_bhndb/Makefile
new file mode 100644
index 000000000000..2dbef19388fe
--- /dev/null
+++ b/sys/modules/bhnd/siba_bhndb/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../../dev/bhnd/siba
+
+KMOD=	siba_bhndb
+SRCS=	siba_bhndb.c
+
+SRCS+=	bhnd_bus_if.h bhndb_if.h
+SRCS+=	device_if.h bus_if.h
+
+.include <bsd.kmod.mk>