Index: head/net/aoe/Makefile
===================================================================
--- head/net/aoe/Makefile	(revision 369831)
+++ head/net/aoe/Makefile	(revision 369832)
@@ -1,31 +1,27 @@
 # Created by: Stacey D. Son <sds@son.org>
 # $FreeBSD$
 
 PORTNAME=	aoe
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	net kld
 MASTER_SITES=	http://www.son.org/download/
 DISTNAME=	${PORTNAME}-freebsd-${PORTVERSION}
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	FreeBSD driver for ATA over Ethernet (AoE)
 
-NO_PACKAGE=	Should be in sync with the kernel to work correctly
 SSP_UNSAFE=	kernel module does not support ssp
 
+USES=	kmod
+
 WRKSRC=		${WRKDIR}/dev/aoe
+KMODDIR=	${PREFIX}/lib/aoe
+
 USE_RC_SUBR=	aoe
 
-pre-everything::
-	@if [ ! -f /usr/src/sys/Makefile ]; then \
-		${ECHO_MSG} ">> The AoE port needs FreeBSD kernel source code to compile."; \
-		${ECHO_MSG} ">> Please install FreeBSD kernel source code in /usr/src/sys."; \
-		${FALSE}; \
-	fi
-
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/aoe
 	${INSTALL_KLD} ${WRKSRC}/aoe.ko ${STAGEDIR}${PREFIX}/lib/aoe
-	${INSTALL_MAN} ${WRKDIR}/aoe.4 ${STAGEDIR}${PREFIX}/man/man4
+	${INSTALL_MAN} ${WRKDIR}/aoe.4 ${STAGEDIR}${PREFIX}/man/man4/
 
 .include <bsd.port.mk>
Index: head/net/aoe/pkg-plist
===================================================================
--- head/net/aoe/pkg-plist	(revision 369831)
+++ head/net/aoe/pkg-plist	(revision 369832)
@@ -1,3 +1,2 @@
 lib/aoe/aoe.ko
 man/man4/aoe.4.gz
-@dirrm lib/aoe