diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 495a0b97fc86..98b40b384c9f 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,71 +1,73 @@
 PORTNAME=	autoconf
 PORTVERSION=	2.71
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Generate configure scripts and related files
 WWW=		https://www.gnu.org/software/autoconf/
 
 LICENSE=	EXCEPTION GFDL GPLv2+ GPLv3+
 LICENSE_COMB=	multi
 LICENSE_NAME_EXCEPTION=	AUTOCONF CONFIGURE SCRIPT EXCEPTION
 LICENSE_FILE_EXCEPTION=	${WRKSRC}/COPYING.EXCEPTION
 LICENSE_FILE_GFDL=	${WRKSRC}/doc/fdl.texi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYINGv3
 LICENSE_PERMS_EXCEPTION=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	gm4:devel/m4
 RUN_DEPENDS=	autoconf-switch>=0:devel/autoconf-switch \
 		gm4:devel/m4
 
 VERSION=	2.71
 USES=		perl5 tar:xz
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--program-suffix=${VERSION} \
 		--without-lispdir
 CONFIGURE_ENV=	AWK=${AWK} \
 		EMACS=no \
 		M4=${LOCALBASE}/bin/gm4
 
 DATADIR=	${PREFIX}/share/autoconf${VERSION}
 NO_ARCH=	yes
 
 PLIST_SUB=	VERSION=${VERSION}
 
 OPTIONS_DEFINE=	INFO
 OPTIONS_DEFAULT=INFO
 
 INFO_USES=	makeinfo
 INFO_INFO=	autoconf${VERSION}
 
 post-patch:
 	@${REINPLACE_CMD} '/^pkgdatadir =/s/@PACKAGE@/&@VERSION@/' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -E \
 		-e 's/[^-/]auto(conf|header|reconf|scan|update)/&${VERSION}/g' \
 		-e 's/ifnames/&${VERSION}/g' \
 		-e '/config\.(guess|sub)/d' \
 		${WRKSRC}/man/*.1
 
 post-patch-INFO-on:
 	@${REINPLACE_CMD} -E 's/autoconf\.(info|texi)/autoconf${VERSION}.\1/g' \
 		${WRKSRC}/Makefile.in
 	@${CP} ${WRKSRC}/doc/autoconf.texi ${WRKSRC}/doc/autoconf${VERSION}.texi
 	@${REINPLACE_CMD} \
 		-e 's/autoconf\.info/autoconf${VERSION}.info/' \
 		-e '/^@direntry/,/^@end/ { \
 			s/^\*[^-:]*/&${VERSION}/ ; \
 			s/(autoconf)/(autoconf${VERSION})/ ; \
 			s/ \{2,9\}/ / ; }' \
 		${WRKSRC}/doc/autoconf${VERSION}.texi
 # Restore timestamp in .info file.
 	@${TOUCH} -r ${WRKSRC}/doc/autoconf${VERSION}.texi.bak \
 		${WRKSRC}/doc/autoconf${VERSION}.texi
 
 post-patch-INFO-off:
 	@${REINPLACE_CMD} '/^INFO_DEPS =/d' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/devel/autoconf/pkg-plist b/devel/autoconf/pkg-plist
index 6111ed2aa925..bbd3fdaf4174 100644
--- a/devel/autoconf/pkg-plist
+++ b/devel/autoconf/pkg-plist
@@ -1,61 +1,61 @@
 bin/autoconf%%VERSION%%
 bin/autoheader%%VERSION%%
 bin/autom4te%%VERSION%%
 bin/autoreconf%%VERSION%%
 bin/autoscan%%VERSION%%
 bin/autoupdate%%VERSION%%
 bin/ifnames%%VERSION%%
-man/man1/autoconf%%VERSION%%.1.gz
-man/man1/autoheader%%VERSION%%.1.gz
-man/man1/autom4te%%VERSION%%.1.gz
-man/man1/autoreconf%%VERSION%%.1.gz
-man/man1/autoscan%%VERSION%%.1.gz
-man/man1/autoupdate%%VERSION%%.1.gz
-man/man1/ifnames%%VERSION%%.1.gz
+share/man/man1/autoconf%%VERSION%%.1.gz
+share/man/man1/autoheader%%VERSION%%.1.gz
+share/man/man1/autom4te%%VERSION%%.1.gz
+share/man/man1/autoreconf%%VERSION%%.1.gz
+share/man/man1/autoscan%%VERSION%%.1.gz
+share/man/man1/autoupdate%%VERSION%%.1.gz
+share/man/man1/ifnames%%VERSION%%.1.gz
 %%DATADIR%%/Autom4te/C4che.pm
 %%DATADIR%%/Autom4te/ChannelDefs.pm
 %%DATADIR%%/Autom4te/Channels.pm
 %%DATADIR%%/Autom4te/Config.pm
 %%DATADIR%%/Autom4te/Configure_ac.pm
 %%DATADIR%%/Autom4te/FileUtils.pm
 %%DATADIR%%/Autom4te/General.pm
 %%DATADIR%%/Autom4te/Getopt.pm
 %%DATADIR%%/Autom4te/Request.pm
 %%DATADIR%%/Autom4te/XFile.pm
 %%DATADIR%%/INSTALL
 %%DATADIR%%/autoconf/autoconf.m4
 %%DATADIR%%/autoconf/autoconf.m4f
 %%DATADIR%%/autoconf/autoheader.m4
 %%DATADIR%%/autoconf/autoscan.m4
 %%DATADIR%%/autoconf/autotest.m4
 %%DATADIR%%/autoconf/autoupdate.m4
 %%DATADIR%%/autoconf/c.m4
 %%DATADIR%%/autoconf/erlang.m4
 %%DATADIR%%/autoconf/fortran.m4
 %%DATADIR%%/autoconf/functions.m4
 %%DATADIR%%/autoconf/general.m4
 %%DATADIR%%/autoconf/go.m4
 %%DATADIR%%/autoconf/headers.m4
 %%DATADIR%%/autoconf/lang.m4
 %%DATADIR%%/autoconf/libs.m4
 %%DATADIR%%/autoconf/oldnames.m4
 %%DATADIR%%/autoconf/programs.m4
 %%DATADIR%%/autoconf/specific.m4
 %%DATADIR%%/autoconf/status.m4
 %%DATADIR%%/autoconf/trailer.m4
 %%DATADIR%%/autoconf/types.m4
 %%DATADIR%%/autom4te.cfg
 %%DATADIR%%/autoscan/autoscan.list
 %%DATADIR%%/autotest/autotest.m4
 %%DATADIR%%/autotest/autotest.m4f
 %%DATADIR%%/autotest/general.m4
 %%DATADIR%%/autotest/specific.m4
 %%DATADIR%%/build-aux/config.guess
 %%DATADIR%%/build-aux/config.sub
 %%DATADIR%%/build-aux/install-sh
 %%DATADIR%%/m4sugar/foreach.m4
 %%DATADIR%%/m4sugar/m4sh.m4
 %%DATADIR%%/m4sugar/m4sh.m4f
 %%DATADIR%%/m4sugar/m4sugar.m4
 %%DATADIR%%/m4sugar/m4sugar.m4f
 %%DATADIR%%/m4sugar/version.m4