diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index af336979e381..2fabefafe3b9 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -1,95 +1,97 @@
 PORTNAME=	wget
 DISTVERSION=	1.21.4
+PORTREVISION=	1
 CATEGORIES=	ftp www
 MASTER_SITES=	GNU
 
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	Retrieve files from the Net via HTTP(S) and FTP
 WWW=		https://www.gnu.org/s/wget/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 TEST_DEPENDS=	p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
 		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
 
 USES=		charsetfix cpe iconv localbase pkgconfig tar:lz
 USE_CSTD=	c99
 CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 OPTIONS_SUB=	yes
 
 OPTIONS_RADIO=	SSL
 OPTIONS_RADIO_SSL=GNUTLS OPENSSL
 OPTIONS_DEFINE=	DOCS IDN IPV6 MANPAGES METALINK NLS PCRE2 PSL NTLM
 OPTIONS_DEFAULT=IDN MANPAGES OPENSSL NLS
 
 DOCS_DESC=	Install info page
 DOCS_CONFIGURE_ENV=	MAKEINFO="${MAKEINFO}"
 DOCS_INFO=	wget
 DOCS_USES=	makeinfo
 
 IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2 \
 			libunistring.so:devel/libunistring
 IDN_CONFIGURE_ENABLE=	iri
 IDN_CONFIGURE_ON=	--with-libidn=${LOCALBASE} \
 			--with-libunistring-prefix=${LOCALBASE}
 IDN_CONFIGURE_OFF=	--with-included-libunistring
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 MANPAGES_CONFIGURE_ENV_OFF=	ac_cv_path_POD2MAN=no
 MANPAGES_USE=		PERL5=build
 MANPAGES_USES=		perl5
 
 METALINK_CONFIGURE_WITH=metalink
 METALINK_LIB_DEPENDS=	libmetalink.so:misc/libmetalink
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 PCRE2_DESC=		Support PCRE2 style regular expressions
 PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 PCRE2_CONFIGURE_ENABLE=	pcre2
 
 PSL_CONFIGURE_WITH=	libpsl
 PSL_LIB_DEPENDS=	libpsl.so:dns/libpsl
 
 NTLM_DESC=		Support NTLM authorization
 NTLM_CONFIGURE_ENABLE=	ntlm
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL}
 USES+=		ssl
 CONFIGURE_ARGS+=--with-ssl=openssl --with-libssl-prefix=${OPENSSLBASE}
 CPPFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 .elif ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=	libgnutls.so:security/gnutls
 CONFIGURE_ARGS+=--with-ssl=gnutls
 . if ${PORT_OPTIONS:MNTLM}
 LIB_DEPENDS+=	libnettle.so:security/nettle
 . endif
 .else
 CONFIGURE_ARGS+=--without-ssl
 .endif
 
 TEST_TARGET=	check
 
 # Executed regardless of whether DOCS is ON or OFF.
 post-patch:
 	${REINPLACE_CMD} -e 's,WGETRC = $$(sysconfdir)/wgetrc,&.sample,' \
 		${WRKSRC}/doc/Makefile.in
 	${REINPLACE_CMD} -e 's,/usr/local/etc/wgetrc,${PREFIX}/etc/wgetrc,' \
 		${WRKSRC}/doc/sample.wgetrc* \
 		${WRKSRC}/doc/wget.texi
 
 post-patch-DOCS-off:
 	${REINPLACE_CMD} \
 		-e '/^all: wget.info/ s,wget.info,,' \
 		-e '/^all-am:/ s, $$(INFO_DEPS),,' \
 		-e '/^install-data-am:/ s, install-info-am,,' \
 		${WRKSRC}/doc/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/ftp/wget/pkg-plist b/ftp/wget/pkg-plist
index a18d8e8d06a6..ea91ae1f5d21 100644
--- a/ftp/wget/pkg-plist
+++ b/ftp/wget/pkg-plist
@@ -1,83 +1,83 @@
-%%MANPAGES%%man/man1/wget.1.gz
+%%MANPAGES%%share/man/man1/wget.1.gz
 %%NLS%%share/locale/af/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/be/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/be/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/da/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/da/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/de/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/de/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/el/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/el/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/es/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/es/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/et/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/et/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/he/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/id/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/it/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/it/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/rw/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/wget.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/wget-gnulib.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/wget.mo
 @sample etc/wgetrc.sample
 bin/wget