diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 9f9e26006e1..773c7a55871 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -35,6 +35,7 @@ SUBDIR=	accf_data \
 	fdescfs \
 	firewire \
 	fxp \
+	geom \
 	gx \
 	hifn \
 	if_disc \
diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile
new file mode 100644
index 00000000000..f3c992db854
--- /dev/null
+++ b/sys/modules/geom/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+SUBDIR=	geom_apple \
+	geom_bde \
+	geom_bsd \
+	geom_gpt \
+	geom_mbr \
+	geom_pc98 \
+	geom_sunlabel
+
+.include <bsd.subdir.mk>
diff --git a/sys/modules/geom/geom_apple/Makefile b/sys/modules/geom/geom_apple/Makefile
new file mode 100644
index 00000000000..4ec59a62928
--- /dev/null
+++ b/sys/modules/geom/geom_apple/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../geom
+
+KMOD=	geom_apple
+SRCS=	geom_apple.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/geom/geom_bde/Makefile b/sys/modules/geom/geom_bde/Makefile
new file mode 100644
index 00000000000..2da5bf411ce
--- /dev/null
+++ b/sys/modules/geom/geom_bde/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../geom/bde
+
+KMOD=	geom_bde
+SRCS=	g_bde.c g_bde_crypt.c g_bde_lock.c g_bde_work.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/geom/geom_bsd/Makefile b/sys/modules/geom/geom_bsd/Makefile
new file mode 100644
index 00000000000..884ac6e98ba
--- /dev/null
+++ b/sys/modules/geom/geom_bsd/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../geom
+
+KMOD=	geom_bsd
+SRCS=	geom_bsd.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/geom/geom_gpt/Makefile b/sys/modules/geom/geom_gpt/Makefile
new file mode 100644
index 00000000000..ca074bda369
--- /dev/null
+++ b/sys/modules/geom/geom_gpt/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../geom
+
+KMOD=	geom_gpt
+SRCS=	geom_gpt.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/geom/geom_mbr/Makefile b/sys/modules/geom/geom_mbr/Makefile
new file mode 100644
index 00000000000..2e119f2b998
--- /dev/null
+++ b/sys/modules/geom/geom_mbr/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../geom
+
+KMOD=	geom_mbr
+SRCS=	geom_mbr.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/geom/geom_pc98/Makefile b/sys/modules/geom/geom_pc98/Makefile
new file mode 100644
index 00000000000..2c5952d3e4f
--- /dev/null
+++ b/sys/modules/geom/geom_pc98/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../geom
+
+KMOD=	geom_pc98
+SRCS=	geom_pc98.c geom_pc98_enc.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/geom/geom_sunlabel/Makefile b/sys/modules/geom/geom_sunlabel/Makefile
new file mode 100644
index 00000000000..840395aaf1d
--- /dev/null
+++ b/sys/modules/geom/geom_sunlabel/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../geom
+
+KMOD=	geom_sunlabel
+SRCS=	geom_sunlabel.c geom_sunlabel_enc.c
+
+.include <bsd.kmod.mk>