diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 116b0cc95952..840304309ddc 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -1,82 +1,83 @@
 PORTNAME=	wzdftpd
 PORTVERSION=	0.8.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	ftp
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-sources/${PORTNAME}-${PORTVERSION:R}
 
 MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	Modular FTP server configurable online using SITE commands
 WWW=		https://sourceforge.net/projects/wzdftpd/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf:2.69 cpe gettext-tools libtool localbase pkgconfig
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--sysconfdir=${ETCDIR} --datadir=${PREFIX}/lib \
 		--disable-bonjour --disable-static
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	wzdftpd
 
 OPTIONS_DEFINE=	AVAHI DOCS ICONV IPV6 MYSQL PAM PERL PGSQL SQLITE TCL
 OPTIONS_RADIO=	TLS
 OPTIONS_RADIO_TLS=	GNUTLS OPENSSL
 OPTIONS_DEFAULT=	AVAHI GNUTLS ICONV PAM PERL SQLITE
 OPTIONS_SUB=	yes
 
 ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
 ICONV_CONFIGURE_OFF=	--disable-utf8
 ICONV_USES=		iconv
 
 TCL_CONFIGURE_ON=	--with-tcl=${TCL_LIBDIR}
 TCL_CONFIGURE_OFF=	--without-tcl
 TCL_USES=		tcl
 
 OPENSSL_CONFIGURE_ENABLE=	openssl
 OPENSSL_USES=		ssl
 
 GNUTLS_CONFIGURE_ENABLE=	gnutls
 GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 PERL_CONFIGURE_ENABLE=	perl
 PERL_USES=		perl5
 
 MYSQL_CONFIGURE_ENABLE=	mysql
 MYSQL_USES=		mysql
 MYSQL_VARS=		IGNORE_WITH_MYSQL="80 81"
 
 PAM_CONFIGURE_WITH=	pam
 
 PGSQL_CONFIGURE_ON=	--with-pgsql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--disable-pgsql
 PGSQL_USES=		pgsql
 
 SQLITE_CONFIGURE_ENABLE=	sqlite3
 SQLITE_USES=			sqlite:3
 
 AVAHI_CONFIGURE_ON=	--with-zeroconf --enable-avahi
 AVAHI_LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 			libavahi-core.so:net/avahi-app
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/config.rpath
 
 # wzd.m4 gets installed into the wrong spot due to our --datadir hack
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/aclocal
 	${MV} ${STAGEDIR}${PREFIX}/lib/aclocal/wzd.m4 ${STAGEDIR}${PREFIX}/share/aclocal
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/aclocal
 	${INSTALL_DATA} ${WRKSRC}/*.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in AUTHORS ChangeLog NEWS Permissions.ReadMeFirst README \
 	TLS.ReadMeFirst UPGRADING wzd_tls.cnf
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/ftp/wzdftpd/pkg-plist b/ftp/wzdftpd/pkg-plist
index b3a273711cd7..a651bda78f52 100644
--- a/ftp/wzdftpd/pkg-plist
+++ b/ftp/wzdftpd/pkg-plist
@@ -1,121 +1,121 @@
 bin/siteconfig
 bin/siteuptime
 bin/sitewho
 bin/wzd-config
-man/man1/siteconfig.1.gz
-man/man1/siteuptime.1.gz
-man/man1/sitewho.1.gz
-man/man1/wzd-config.1.gz
-man/man8/wzdftpd.8.gz
 %%ETCDIR%%/file_ginfo.txt
 %%ETCDIR%%/file_group.txt
 %%ETCDIR%%/file_groups.txt
 %%ETCDIR%%/file_help.txt
 %%ETCDIR%%/file_rules.txt
 %%ETCDIR%%/file_swho.txt
 %%ETCDIR%%/file_user.txt
 %%ETCDIR%%/file_users.txt
 %%ETCDIR%%/file_vfs.txt
 %%ETCDIR%%/file_who.txt
 %%ETCDIR%%/users.sample
 @sample %%ETCDIR%%/wzd.cfg.sample
 %%ETCDIR%%/wzd.pem
 include/wzdftpd/libwzd-auth/wzd_auth.h
 include/wzdftpd/libwzd-auth/wzd_base64.h
 include/wzdftpd/libwzd-auth/wzd_crypt.h
 include/wzdftpd/libwzd-auth/wzd_krb5.h
 include/wzdftpd/libwzd-auth/wzd_md5.h
 include/wzdftpd/libwzd-auth/wzd_md5crypt.h
 include/wzdftpd/libwzd-auth/wzd_pam.h
 include/wzdftpd/libwzd-auth/wzd_sha1.h
 include/wzdftpd/libwzd-auth/wzd_tls.h
 include/wzdftpd/libwzd-base/dlist.h
 include/wzdftpd/libwzd-base/hash.h
 include/wzdftpd/libwzd-base/list.h
 include/wzdftpd/libwzd-base/stack.h
 include/wzdftpd/libwzd-base/strpcpy.h
 include/wzdftpd/libwzd-base/wzd_strlcat.h
 include/wzdftpd/libwzd-base/wzd_strtok_r.h
 include/wzdftpd/libwzd-core/arch/bsd.h
 include/wzdftpd/libwzd-core/arch/win32.h
 include/wzdftpd/libwzd-core/wzd_ClientThread.h
 include/wzdftpd/libwzd-core/wzd_action.h
 include/wzdftpd/libwzd-core/wzd_all.h
 include/wzdftpd/libwzd-core/wzd_backend.h
 include/wzdftpd/libwzd-core/wzd_cache.h
 include/wzdftpd/libwzd-core/wzd_commands.h
 include/wzdftpd/libwzd-core/wzd_configfile.h
 include/wzdftpd/libwzd-core/wzd_configloader.h
 include/wzdftpd/libwzd-core/wzd_crc32.h
 include/wzdftpd/libwzd-core/wzd_crontab.h
 include/wzdftpd/libwzd-core/wzd_data.h
 include/wzdftpd/libwzd-core/wzd_debug.h
 include/wzdftpd/libwzd-core/wzd_dir.h
 include/wzdftpd/libwzd-core/wzd_events.h
 include/wzdftpd/libwzd-core/wzd_file.h
 include/wzdftpd/libwzd-core/wzd_fs.h
 include/wzdftpd/libwzd-core/wzd_group.h
 include/wzdftpd/libwzd-core/wzd_hardlimits.h
 include/wzdftpd/libwzd-core/wzd_ip.h
 include/wzdftpd/libwzd-core/wzd_libmain.h
 include/wzdftpd/libwzd-core/wzd_list.h
 include/wzdftpd/libwzd-core/wzd_log.h
 include/wzdftpd/libwzd-core/wzd_login.h
 include/wzdftpd/libwzd-core/wzd_messages.h
 include/wzdftpd/libwzd-core/wzd_misc.h
 include/wzdftpd/libwzd-core/wzd_mod.h
 include/wzdftpd/libwzd-core/wzd_mutex.h
 include/wzdftpd/libwzd-core/wzd_perm.h
 include/wzdftpd/libwzd-core/wzd_protocol.h
 include/wzdftpd/libwzd-core/wzd_ratio.h
 include/wzdftpd/libwzd-core/wzd_section.h
 include/wzdftpd/libwzd-core/wzd_shm.h
 include/wzdftpd/libwzd-core/wzd_site.h
 include/wzdftpd/libwzd-core/wzd_site_group.h
 include/wzdftpd/libwzd-core/wzd_site_user.h
 include/wzdftpd/libwzd-core/wzd_socket.h
 include/wzdftpd/libwzd-core/wzd_string.h
 include/wzdftpd/libwzd-core/wzd_structs.h
 include/wzdftpd/libwzd-core/wzd_threads.h
 include/wzdftpd/libwzd-core/wzd_tls.h
 include/wzdftpd/libwzd-core/wzd_types.h
 include/wzdftpd/libwzd-core/wzd_user.h
 include/wzdftpd/libwzd-core/wzd_utf8.h
 include/wzdftpd/libwzd-core/wzd_vars.h
 include/wzdftpd/libwzd-core/wzd_vfs.h
 include/wzdftpd/libwzd.h
 include/wzdftpd/libwzd_codes.h
 include/wzdftpd/libwzd_err.h
 include/wzdftpd/libwzd_pv.h
 include/wzdftpd/libwzd_socket.h
 include/wzdftpd/libwzd_tls.h
 lib/libwzd.so
 lib/libwzd.so.0
 lib/libwzd.so.0.801.1
 lib/libwzd_core.so
 lib/libwzd_core.so.0
 lib/libwzd_core.so.0.801.1
 %%PERL%%%%SITE_ARCH%%/auto/wzdftpd/wzdftpd.so
 %%PERL%%%%SITE_ARCH%%/wzdftpd.pm
 %%MYSQL%%lib/wzdftpd/backends/libwzdmysql.so
 %%PAM%%lib/wzdftpd/backends/libwzdpam.so
 %%PGSQL%%lib/wzdftpd/backends/libwzdpgsql.so
 lib/wzdftpd/backends/libwzdplaintext.so
 %%SQLITE%%lib/wzdftpd/backends/libwzdsqlite.so
 lib/wzdftpd/modules/libwzd_debug.so
 %%PERL%%lib/wzdftpd/modules/libwzd_perl.so
 %%PERL%%%%PERL5_MAN3%%/wzdftpd.3.gz
 lib/wzdftpd/modules/libwzd_sfv.so
 %%TCL%%lib/wzdftpd/modules/libwzd_tcl.so
 %%AVAHI%%lib/wzdftpd/modules/libwzd_zeroconf.so
 libdata/pkgconfig/wzdftpd.pc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/Permissions.ReadMeFirst
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TLS.ReadMeFirst
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%PORTDOCS%%%%DOCSDIR%%/wzd_tls.cnf
 sbin/wzdftpd
 share/aclocal/wzd.m4
+share/man/man1/siteconfig.1.gz
+share/man/man1/siteuptime.1.gz
+share/man/man1/sitewho.1.gz
+share/man/man1/wzd-config.1.gz
+share/man/man8/wzdftpd.8.gz