diff --git a/ftp/bsdftpd-ssl/Makefile b/ftp/bsdftpd-ssl/Makefile
index 25221ca1c7e8..1f9149b66ba2 100644
--- a/ftp/bsdftpd-ssl/Makefile
+++ b/ftp/bsdftpd-ssl/Makefile
@@ -1,77 +1,77 @@
 PORTNAME=	bsdftpd-ssl
 PORTVERSION=	1.1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.sourcefiles.org/System/Daemons/FTP/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	skynick@mail.sc.ru
 COMMENT=	Secure FTP client/server with TLS/SSL support
 WWW=		http://bsdftpd-ssl.sc.ru
 
 USES=		ssl
 MAKE_ENV+=	OBJFORMAT=elf
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	SERVER DOCS EXAMPLES
 SERVER_DESC=	Build/install FTP server as well
 OPTIONS_SUB=	yes
 USE_RC_SUBR=	${PORTNAME}
 
 # in case people still have CLIENT_ONLY defined...
 .if !defined(CLIENT_ONLY)
 OPTIONS_DEFAULT=SERVER
 .endif
 
 # explicitly link against libpam to support external toolchains.
 LDFLAGS+=	-lpam
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSERVER} && ${PORT_OPTIONS:MEXAMPLES}
 SUB_FILES=	pkg-message
 .endif
 
 post-patch:
 	${MV} ${WRKSRC}/docs/README ${WRKSRC}/docs/README-docs
 
 do-configure:
 	(cd ${WRKSRC} && ./config.sh FreeBSD) || true
 
 do-build:
 	${DO_MAKE_BUILD} -C ${WRKSRC}/port
 	${DO_MAKE_BUILD} -C ${WRKSRC}/ftp
 .if ${PORT_OPTIONS:MSERVER}
 	${DO_MAKE_BUILD} -C ${WRKSRC}/ftpd
 .endif
 
 do-install:
 # Client part
 	${INSTALL_PROGRAM} ${WRKSRC}/ftp/ftps ${STAGEDIR}${PREFIX}/bin/ftps
-	${INSTALL_MAN} ${WRKSRC}/ftp/ftps.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/ftps.1.gz
+	${INSTALL_MAN} ${WRKSRC}/ftp/ftps.1.gz ${STAGEDIR}${PREFIX}/share/man/man1/ftps.1.gz
 # Server part
 .if ${PORT_OPTIONS:MSERVER}
 	${INSTALL_PROGRAM} ${WRKSRC}/ftpd/ftpd ${STAGEDIR}${PREFIX}/libexec/ftpd
-	${INSTALL_MAN} ${WRKSRC}/ftpd/ftpchroot.5.gz ${STAGEDIR}${MANPREFIX}/man/man5/ftpchroot.5.gz
-	${INSTALL_MAN} ${WRKSRC}/ftpd/xferlog.5.gz ${STAGEDIR}${MANPREFIX}/man/man5/xferlog.5.gz
-	${INSTALL_MAN} ${WRKSRC}/ftpd/ftpd.8.gz ${STAGEDIR}${MANPREFIX}/man/man8/ftpd.8.gz
-	${LN} -s ftpchroot.5.gz ${STAGEDIR}${MANPREFIX}/man/man5/ftpchroot-ssl.5.gz
-	${LN} -s ftpd.8.gz ${STAGEDIR}${MANPREFIX}/man/man8/ftpd-ssl.8.gz
+	${INSTALL_MAN} ${WRKSRC}/ftpd/ftpchroot.5.gz ${STAGEDIR}${PREFIX}/share/man/man5/ftpchroot.5.gz
+	${INSTALL_MAN} ${WRKSRC}/ftpd/xferlog.5.gz ${STAGEDIR}${PREFIX}/share/man/man5/xferlog.5.gz
+	${INSTALL_MAN} ${WRKSRC}/ftpd/ftpd.8.gz ${STAGEDIR}${PREFIX}/share/man/man8/ftpd.8.gz
+	${LN} -s ftpchroot.5.gz ${STAGEDIR}${PREFIX}/share/man/man5/ftpchroot-ssl.5.gz
+	${LN} -s ftpd.8.gz ${STAGEDIR}${PREFIX}/share/man/man8/ftpd-ssl.8.gz
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
 . for file in COPYRIGHT README INSTALL ChangeLog
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 . endfor
 
 .if ${PORT_OPTIONS:MSERVER} && ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/cert
 	${INSTALL_SCRIPT} ${WRKSRC}/cert/* ${STAGEDIR}${EXAMPLESDIR}/cert
 . for file in README.examples ftpchroot ftpusers rc_conf_d.bsdftpd_ssl
 	${INSTALL_DATA} ${FILESDIR}/${file} ${STAGEDIR}${EXAMPLESDIR}
 . endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/ftp/bsdftpd-ssl/pkg-plist b/ftp/bsdftpd-ssl/pkg-plist
index 5e2c4ce7ebf0..87834b6d8045 100644
--- a/ftp/bsdftpd-ssl/pkg-plist
+++ b/ftp/bsdftpd-ssl/pkg-plist
@@ -1,28 +1,28 @@
 bin/ftps
-man/man1/ftps.1.gz
+share/man/man1/ftps.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README-docs
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/cert-basics.txt
 %%PORTDOCS%%%%DOCSDIR%%/cert-howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/ciphers.txt
 %%PORTDOCS%%%%DOCSDIR%%/licenses
 %%PORTDOCS%%%%DOCSDIR%%/standards.txt
 %%PORTDOCS%%%%DOCSDIR%%/verify.txt
 %%PORTDOCS%%%%DOCSDIR%%/x509_auth.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cert/cert-nopass.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cert/cert-pass.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cert/cert-dummy.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cert/xCA.sh
 %%SERVER%%libexec/ftpd
-%%SERVER%%man/man5/ftpchroot.5.gz
-%%SERVER%%man/man5/ftpchroot-ssl.5.gz
-%%SERVER%%man/man5/xferlog.5.gz
-%%SERVER%%man/man8/ftpd.8.gz
-%%SERVER%%man/man8/ftpd-ssl.8.gz
+%%SERVER%%share/man/man5/ftpchroot.5.gz
+%%SERVER%%share/man/man5/ftpchroot-ssl.5.gz
+%%SERVER%%share/man/man5/xferlog.5.gz
+%%SERVER%%share/man/man8/ftpd.8.gz
+%%SERVER%%share/man/man8/ftpd-ssl.8.gz
 %%SERVER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.examples
 %%SERVER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpchroot
 %%SERVER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ftpusers
 %%SERVER%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rc_conf_d.bsdftpd_ssl