Index: head/emulators/hyperv-is/Makefile
===================================================================
--- head/emulators/hyperv-is/Makefile	(revision 370395)
+++ head/emulators/hyperv-is/Makefile	(revision 370396)
@@ -1,64 +1,66 @@
 # $FreeBSD$
 
 PORTNAME=	hyperv-is
 PORTVERSION=	1.1
-PORTREVISION=	1
-CATEGORIES=	emulators kld
+PORTREVISION=	2
+CATEGORIES=	emulators
 MASTER_SITES=	https://github.com/${MSLINK}/
 DISTNAME=	${DNAME}
 
 MAINTAINER=	bsdic@microsoft.com
 COMMENT=	FreeBSD Integration Service on Hyper-v
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-USES+=		uidfix
+USES=		kmod uidfix
 BIS=		${PORTVERSION}
 MSBASE=		FreeBSDonHyper-V/Hyperv-Ports/raw/hyperv-is-master
 MSLINK=		${MSBASE}/BIS-${BIS}/FreeBSD-${OSREL}/ports
 MAKE_ARGS=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man
 PKGMESSAGE=	${FILESDIR}/${PMSG}
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} != FreeBSD
 IGNORE=		${OPSYS} not supported
 .endif
 
 .if ${OSREL} == "10.0"
 BIS=		1.0
 PLIST_SUB=	A="@comment " B=""
 PMSG=		pkg-message.B
 .else
 CC=		gcc -w
 WRKSRC=		${WRKDIR}/hyperv-is-${PORTVERSION}
 PLIST_SUB=	B="@comment " A=""
 PMSG=		pkg-message.A
 .endif
 
 FILE_84=	hyperv-is-8.4.${BIS}
 FILE_91=	hyperv-is-9.1.${BIS}
 FILE_92=	hyperv-is-9.2.${BIS}
 FILE_93=	hyperv-is-9.3.${BIS}
 FILE_100=	hv-kvp-${BIS}
 DNAME=		${FILE_${OSREL:S/.//}}
 
 .if empty(DNAME)
-IGNORE=		OSREL ${OSREL} not supported
+IGNORE?=	OSREL ${OSREL} not supported
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,/usr/sbin/,${PREFIX}/sbin/,g" \
 		${WRKSRC}/etc/rc.d/hv_kvpd
 
 pre-install:
-	@${MKDIR} ${STAGEDIR}/boot/kernel \
+	@${MKDIR} ${STAGEDIR}${PREFIX} \
 		${STAGEDIR}/etc/rc.d \
 		${STAGEDIR}/usr/local/hyperv/scripts
 
 post-install:
 	${RM} ${STAGEDIR}/boot/kernel/linker.hints
 	${MV} ${STAGEDIR}/etc/rc.d/* ${STAGEDIR}${PREFIX}/etc/rc.d
-
+.if ${PREFIX} != /usr/local
+	${MV} ${STAGEDIR}/usr/local/* ${STAGEDIR}${PREFIX}
+.endif
 
 .include <bsd.port.post.mk>
Index: head/emulators/hyperv-is/pkg-plist
===================================================================
--- head/emulators/hyperv-is/pkg-plist	(revision 370395)
+++ head/emulators/hyperv-is/pkg-plist	(revision 370396)
@@ -1,19 +1,19 @@
 hyperv/scripts/hv_get_dhcp_info
 hyperv/scripts/hv_get_dns_info
 hyperv/scripts/hv_set_ifconfig
-%%A%%/boot/kernel/hv_ata_pci_disengage.ko
-%%A%%/boot/kernel/hv_netvsc.ko
-%%A%%/boot/kernel/hv_storvsc.ko
-%%A%%/boot/kernel/hv_utils.ko
-%%A%%/boot/kernel/hv_vmbus.ko
-%%B%%/boot/kernel/hv_kvp.ko
+%%A%%/boot/modules/hv_ata_pci_disengage.ko
+%%A%%/boot/modules/hv_netvsc.ko
+%%A%%/boot/modules/hv_storvsc.ko
+%%A%%/boot/modules/hv_utils.ko
+%%A%%/boot/modules/hv_vmbus.ko
+%%B%%/boot/modules/hv_kvp.ko
 etc/rc.d/hv_kvpd
-%%A%%man/man1/hyperv-is.1.gz
 %%B%%sbin/hv_kvp_daemon
+%%A%%man/man1/hyperv-is.1.gz
 %%A%%man/man4/hv_ata_pci_disengage.4.gz
 man/man4/hv_kvp.4.gz
 %%A%%man/man4/hv_netvsc.4.gz
 %%A%%man/man4/hv_storvsc.4.gz
 %%A%%man/man4/hv_utils.4.gz
 %%A%%man/man4/hv_vmbus.4.gz
 %%B%%man/man8/hv_kvp_daemon.8.gz