diff --git a/net/pxe/Makefile b/net/pxe/Makefile
index 372265249cec..05e1c514906a 100644
--- a/net/pxe/Makefile
+++ b/net/pxe/Makefile
@@ -18,25 +18,22 @@ CONFIGURE_ARGS+=	--with-config=${PREFIX}/etc/pxe.conf \
 			--with-log=/var/log/pxe.log \
 			--with-setuid=nobody
 
-DOCS=	Changes INSTALL LICENCE README THANKS
+PORTDOCS=	Changes INSTALL LICENCE README THANKS
+PLIST_FILES=	sbin/pxe etc/pxe.conf.sample
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	${REINPLACE_CMD} -e 's|/tmp/pxe.pid|/var/run/pxe.pid|' ${WRKSRC}/autoconf.h.in
+	${REINPLACE_CMD} -e 's|/tmp/pxe.pid|/var/run/pxe.pid|' \
+		${WRKSRC}/autoconf.h.in
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pxe ${PREFIX}/sbin/
-	${INSTALL_DATA} ${WRKSRC}/pxe.conf ${PREFIX}/etc/pxe.conf.sample
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d -m 0755 ${DOCSDIR}
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+	${INSTALL_PROGRAM} ${WRKSRC}/pxe ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKSRC}/pxe.conf \
+		${STAGEDIR}${PREFIX}/etc/pxe.conf.sample
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
-post-install:
-	${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/pxe/pkg-plist b/net/pxe/pkg-plist
deleted file mode 100644
index df1295d12564..000000000000
--- a/net/pxe/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-sbin/pxe
-etc/pxe.conf.sample
-%%PORTDOCS%%share/doc/pxe/Changes
-%%PORTDOCS%%share/doc/pxe/INSTALL
-%%PORTDOCS%%share/doc/pxe/LICENCE
-%%PORTDOCS%%share/doc/pxe/README
-%%PORTDOCS%%share/doc/pxe/THANKS
-%%PORTDOCS%%@dirrm share/doc/pxe