diff --git a/irc/darkbot/Makefile b/irc/darkbot/Makefile
index 2b2fbff1f6c7..24ba85f3e78d 100644
--- a/irc/darkbot/Makefile
+++ b/irc/darkbot/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	darkbot
 PORTVERSION=	6f6.r6
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://darkbot.sourceforge.net/archive/unix/ \
@@ -14,48 +15,39 @@ COMMENT=	IRC talking bot with a fast algorithm for its database
 
 SUB_FILES=	pkg-message
 
-MAN1=		darkbot.1
-MANCOMPRESSED=	yes
-
 PORTDOCS=	README
-PLIST_FILES=	bin/darkbot %%ETCDIR%%/logs/.pkgcreate
+PLIST_FILES=	bin/darkbot %%ETCDIR%%/logs/.pkgcreate man/man1/darkbot.1.gz
+PLIST_DIRSTRY=	%%ETCDIR%%/logs/ %%ETCDIR%%/dat/ %%ETCDIR%%
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
 	${CP} ${WRKSRC}/configure ${WRKSRC}/config
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1.gz ${MAN1PREFIX}/man/man1/
-
-post-install:
-	${MKDIR} ${ETCDIR}/dat ${ETCDIR}/logs
-	${TOUCH} ${ETCDIR}/logs/.pkgcreate
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1/
+	${MKDIR} ${STAGEDIR}${ETCDIR}/dat ${STAGEDIR}${ETCDIR}/logs
+	${TOUCH} ${STAGEDIR}${ETCDIR}/logs/.pkgcreate
 	cd ${WRKSRC}/dat; \
 	for file in *; do \
-	    ${INSTALL_DATA} $$file ${ETCDIR}/dat/$${file}.dist; \
-	    ${CP} -np ${ETCDIR}/dat/$${file}.dist ${ETCDIR}/dat/$$file || ${TRUE} ; \
+	    ${INSTALL_DATA} $$file ${STAGEDIR}${ETCDIR}/dat/$${file}.dist; \
+	    ${CP} -np ${ETCDIR}/dat/$${file}.dist ${STAGEDIR}${ETCDIR}/dat/$$file || ${TRUE} ; \
 	    ${ECHO_CMD} "@unexec cmp -s ${ETCDIR}/dat/$$file \
 		${ETCDIR}/dat/$${file}.dist && \
 		rm -f ${ETCDIR}/dat/$$file || true" >> ${TMPPLIST}; \
 	    ${ECHO_CMD} "${ETCDIR_REL}/dat/$${file}.dist" >> ${TMPPLIST}; \
 	    ${ECHO_CMD} "@exec cp -np %D/%F %B/$$file || true" >> ${TMPPLIST}; \
 	done
-	${ECHO_CMD} "@unexec rmdir ${ETCDIR}/logs 2>/dev/null || true" >> ${TMPPLIST}
-	${ECHO_CMD} "@unexec rmdir ${ETCDIR}/dat 2>/dev/null || true" >> ${TMPPLIST}
-	${ECHO_CMD} "@unexec rmdir ${ETCDIR} 2>/dev/null || true" >> ${TMPPLIST}
 	${ECHO_CMD} '#!/bin/sh' > ${WRKSRC}/configure
 	${ECHO_CMD} 'cd ${ETCDIR} && ${SH} config' >> ${WRKSRC}/configure
 .for s in config configure AddServer Adduser
-	${INSTALL_SCRIPT} ${WRKSRC}/$s ${ETCDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/$s ${STAGEDIR}${ETCDIR}
 	${ECHO_CMD} ${ETCDIR_REL}/$s >> ${TMPPLIST}
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/README ${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/README ${STAGEDIR}${DOCSDIR}/
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>