diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
index baaf6abf8e5e..6850c90b8406 100644
--- a/mail/mairix/Makefile
+++ b/mail/mairix/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mairix
-PORTVERSION=	0.22
+PORTVERSION=	0.23
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
@@ -14,11 +14,11 @@ LICENSE=	GPLv2
 USES=		bison gmake
 HAS_CONFIGURE=	yes
 
-MAN1=		mairix.1
-MAN5=		mairixrc.5
 PORTDOCS=	NEWS README
 PORTEXAMPLES=	dotmairixrc.eg
-PLIST_FILES=	bin/mairix
+PLIST_FILES=	bin/mairix \
+		man/man1/mairix.1.gz \
+		man/man5/mairixrc.5.gz
 
 OPTIONS_DEFINE=	GZIP BZIP2 EXAMPLES DOCS
 GZIP_DESC=	gzip compressed mbox support
@@ -27,26 +27,18 @@ BZIP2_DESC=	bzip2 compressed mbox support
 GZIP_CONFIGURE_ENABLE=	gzip-mbox
 BZIP2_CONFIGURE_ENABLE=	bzip-mbox
 
-MAKE_JOBS_UNSAFE=	yes
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 # Do not hardcode make(1) binary name
 post-patch:
 	@${REINPLACE_CMD} -E 's|cd (.+) ; make|$$(MAKE) -C \1|' \
 		${WRKSRC}/Makefile.in
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mairix ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/mairix.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/mairixrc.5 ${MANPREFIX}/man/man5
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/README ${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/dotmairixrc.eg ${EXAMPLESDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/mairix ${STAGEDIR}/${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/mairix.1 ${STAGEDIR}/${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/mairixrc.5 ${STAGEDIR}/${MANPREFIX}/man/man5
+	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/README ${STAGEDIR}/${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/dotmairixrc.eg ${STAGEDIR}/${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/mairix/distinfo b/mail/mairix/distinfo
index c6660e8b1665..4bf403a73b7e 100644
--- a/mail/mairix/distinfo
+++ b/mail/mairix/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mairix-0.22.tar.gz) = 141fb273ef9f77562e609a9f6d2f783b680cc4e04be0f9ca8d682f8bc6c19d4f
-SIZE (mairix-0.22.tar.gz) = 161843
+SHA256 (mairix-0.23.tar.gz) = 804e235b183c3350071a28cdda8eb465bcf447092a8206f40486191875bdf2fb
+SIZE (mairix-0.23.tar.gz) = 193726