diff --git a/mail/nbsmtp/Makefile b/mail/nbsmtp/Makefile
index c17fad974964..441b5fa77362 100644
--- a/mail/nbsmtp/Makefile
+++ b/mail/nbsmtp/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	nbsmtp
 PORTVERSION=	1.00
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	LOCAL/ehaupt
 
@@ -11,12 +11,15 @@ LICENSE=	GPLv2
 
 USES=		cpe ssl
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-ssl --enable-ipv6
-CPPFLAGS+=	-I${OPENSSLINC}
+CONFIGURE_ARGS=	--enable-ipv6 \
+		--enable-ssl
 CFLAGS+=	-I${OPENSSLINC}
+CPPFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 
-PLIST_FILES=	bin/nbsmtp man/man5/nbsmtprc.5.gz man/man8/nbsmtp.8.gz
+PLIST_FILES=	bin/nbsmtp \
+		share/man/man5/nbsmtprc.5.gz \
+		share/man/man8/nbsmtp.8.gz
 
 post-patch:
 	${REINPLACE_CMD} -e 's@\(-o nbsmtp\)@$$(LDFLAGS) \1@g'	\
@@ -26,7 +29,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/nbsmtprc.5 ${STAGEDIR}${MANPREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/nbsmtp.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/nbsmtprc.5 ${STAGEDIR}${PREFIX}/share/man/man5
+	${INSTALL_MAN} ${WRKSRC}/nbsmtp.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>