diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index d25ead2d47f7..b8d172a59b36 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -125,6 +125,7 @@ SUBDIR=	\
 	${_hptmv} \
 	${_hptrr} \
 	hwpmc \
+	${_hyperv} \
 	${_i2c} \
 	${_ibcs2} \
 	${_ichwd} \
@@ -661,6 +662,7 @@ _hptiop=	hptiop
 _hptmv=		hptmv
 _hptrr=		hptrr
 .endif
+_hyperv=	hyperv
 _i2c=		i2c
 _ichwd=		ichwd
 _ida=		ida
diff --git a/sys/modules/hyperv/Makefile b/sys/modules/hyperv/Makefile
new file mode 100644
index 000000000000..3bae26ac4030
--- /dev/null
+++ b/sys/modules/hyperv/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR = vmbus netvsc storvsc utilities
+
+.include <bsd.subdir.mk>
diff --git a/sys/modules/hyperv/netvsc/Makefile b/sys/modules/hyperv/netvsc/Makefile
new file mode 100644
index 000000000000..900c1a0b1be7
--- /dev/null
+++ b/sys/modules/hyperv/netvsc/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.PATH:  ${.CURDIR}/../../../contrib/dev/hyperv/netvsc
+
+KMOD    = hv_netvsc
+
+SRCS    = hv_net_vsc.c \
+	  hv_netvsc_drv_freebsd.c \
+	  hv_rndis_filter.c
+
+CFLAGS 	+= -I${.CURDIR}/../../../contrib/dev/hyperv/include \
+	   -I${.CURDIR}/../../../contrib/dev/hyperv/netvsc \
+	   -I${.CURDIR}/../../../contrib
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/hyperv/storvsc/Makefile b/sys/modules/hyperv/storvsc/Makefile
new file mode 100644
index 000000000000..da98a6ec0d39
--- /dev/null
+++ b/sys/modules/hyperv/storvsc/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.PATH:  ${.CURDIR}/../../../contrib/dev/hyperv/storvsc
+
+KMOD=	 hv_storvsc
+
+SRCS =	hv_storvsc_drv_freebsd.c \
+	hv_vstorage.h
+
+CFLAGS+= -I${.CURDIR}/../../../contrib/dev/hyperv/include \
+	 -I${.CURDIR}/../../../contrib/dev/hyperv/vmbus	\
+	 -I${.CURDIR}/../../../contrib/dev/hyperv/storvsc \
+	 -I${.CURDIR}/../../../contrib
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/hyperv/utilities/Makefile b/sys/modules/hyperv/utilities/Makefile
new file mode 100644
index 000000000000..388182cedd5b
--- /dev/null
+++ b/sys/modules/hyperv/utilities/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../../contrib/dev/hyperv/utilities
+
+KMOD=	 hv_utils
+
+SRCS =  hv_util.c
+
+CFLAGS+= -I${.CURDIR}/../../../contrib/dev/hyperv/include \
+	 -I${.CURDIR}/../../../contrib/dev/hyperv/vmbus \
+	 -I${.CURDIR}/../../../contrib
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/hyperv/vmbus/Makefile b/sys/modules/hyperv/vmbus/Makefile
new file mode 100644
index 000000000000..ab5a6eafb104
--- /dev/null
+++ b/sys/modules/hyperv/vmbus/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../../contrib/dev/hyperv/vmbus \
+	${.CURDIR}/../../../contrib/dev/hyperv/utilities
+
+KMOD=	 hv_vmbus
+
+SRCS =  hv_channel.c \
+	hv_channel_mgmt.c \
+	hv_connection.c \
+	hv_hv.c \
+	hv_ring_buffer.c \
+	hv_vmbus_drv_freebsd.c \
+	hv_vmbus_priv.h
+
+CFLAGS+= -I${.CURDIR}/../../../contrib/dev/hyperv/include \
+	 -I${.CURDIR}/../../../contrib/dev/hyperv/vmbus \
+	 -I${.CURDIR}/../../../contrib/dev/hyperv/utilities \
+	 -I${.CURDIR}/../../../contrib
+
+.include <bsd.kmod.mk>