diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index be72c4870dee..cf05ec207d30 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -1,52 +1,53 @@
 PORTNAME=	pavuk
 PORTVERSION=	0.9.35
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	ftp www
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTTP, FTP, and Gopher mirroring tool
 WWW=		https://pavuk.sourceforge.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cpe localbase ssl tar:bzip2
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-locale-dir=${PREFIX}/share/locale \
 		--disable-debug --disable-gnome --disable-js \
 		--enable-utf-8 --enable-threads
 
 OPTIONS_DEFINE=	DANTE GTK2 NLS DOCS
 DANTE_DESC=	Enable SOCKS proxy support
 OPTIONS_DEFAULT=	GTK2
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 GTK2_CONFIGURE_ENABLE=	gtk
 GTK2_USES=		gnome
 GTK2_USE=		GNOME=gtk20
 
 DANTE_CONFIGURE_ENABLE=	socks
 DANTE_CONFIGURE_ON=	--with-socks-includes=${LOCALBASE}/include \
 			--with-socks-libraries=${LOCALBASE}/lib
 DANTE_LIB_DEPENDS=	libsocks.so:net/dante
 
 pre-patch:
 	@${FIND}  ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|$$(datadir)/icons|$$(pkgdatadir)/icons|g'
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/pavuk_authinfo.sample ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/pavukrc.sample ${STAGEDIR}${PREFIX}/etc
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in AUTHORS BUGS CREDITS ChangeLog MAILINGLIST NEWS \
 	README TODO wget-pavuk.HOWTO
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/ftp/pavuk/pkg-plist b/ftp/pavuk/pkg-plist
index f7acdfba290f..66d8498e83b4 100644
--- a/ftp/pavuk/pkg-plist
+++ b/ftp/pavuk/pkg-plist
@@ -1,29 +1,29 @@
 bin/pavuk
 bin/pavuk.sh
 bin/tperf.sh
-man/man1/pavuk.1.gz
+share/man/man1/pavuk.1.gz
 etc/pavuk_authinfo.sample
 etc/pavukrc.sample
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/MAILINGLIST
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/wget-pavuk.HOWTO
 %%NLS%%share/locale/cs/LC_MESSAGES/pavuk.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pavuk.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pavuk.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pavuk.mo
 %%NLS%%share/locale/it/LC_MESSAGES/pavuk.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/pavuk.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/pavuk.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/pavuk.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/pavuk.mo
 %%DATADIR%%/icons/pavuk_16x16.xpm
 %%DATADIR%%/icons/pavuk_32x32.xpm
 %%DATADIR%%/icons/pavuk_64x64.xpm
 %%DATADIR%%/icons/pavuk_as_icon.xpm
 %%DATADIR%%/icons/pavuk_prg_icon.xpm