diff --git a/mail/pysieved/Makefile b/mail/pysieved/Makefile
index fb93003c16a9..e0b4d206779b 100644
--- a/mail/pysieved/Makefile
+++ b/mail/pysieved/Makefile
@@ -18,11 +18,8 @@ USE_RC_SUBR=	${PORTNAME}
 PORTEXAMPLES=	pysieved.xinetd
 SUB_LIST=	PORTNAME=${PORTNAME} PYTHON_CMD=${PYTHON_CMD}
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	COPYING README README.Dovecot THANKS
-.endif
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} \
 		's!/usr/bin/env python!${PYTHON_CMD}!' \
@@ -33,27 +30,18 @@ do-build:
 		-d ${PREFIX}/lib/${PORTNAME} ${WRKSRC}
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	(cd ${WRKSRC} && \
-		${COPYTREE_SHARE} "*.py *.pyc plugins" ${PREFIX}/lib/${PORTNAME})
-	${CHMOD} ${BINMODE} ${PREFIX}/lib/${PORTNAME}/${PORTNAME}.py
+		${COPYTREE_SHARE} "*.py *.pyc plugins" ${STAGEDIR}${PREFIX}/lib/${PORTNAME})
+	${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME}.py
 	${INSTALL_DATA} ${WRKSRC}/pysieved.ini \
-		${PREFIX}/etc/pysieved.ini.sample
+		${STAGEDIR}${PREFIX}/etc/pysieved.ini.sample
 
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/contrib && \
-		${COPYTREE_SHARE} "${PORTEXAMPLES}" ${EXAMPLESDIR})
-.endif
+		${COPYTREE_SHARE} "${PORTEXAMPLES}" ${STAGEDIR}${EXAMPLESDIR})
 
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${DOCSDIR})
-.endif
-
-post-install:
-	@if [ ! -f ${PREFIX}/etc/pysieved.ini ]; then \
-		${CP} -p ${PREFIX}/etc/pysieved.ini.sample ${PREFIX}/etc/pysieved.ini; \
-	fi
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>