diff --git a/textproc/flex/Makefile b/textproc/flex/Makefile
index 96fa473fc98d..62f06004d871 100644
--- a/textproc/flex/Makefile
+++ b/textproc/flex/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	flex
 PORTVERSION=	2.6.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc devel
 MASTER_SITES=	https://github.com/westes/flex/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Fast lexical analyzer generator
 WWW=		https://github.com/westes/flex
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	help2man:misc/help2man
 
 USES=		bison:alias cpe gmake libtool makeinfo
 CPE_VENDOR=	${PORTNAME}_project
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 # install flex header to its own dir to avoid conflict with system flex.
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/flex --disable-shared
 CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split" \
 		CC_FOR_BUILD="${CC}" \
                 CFLAGS_FOR_BUILD="${CFLAGS}" \
                 CPPFLAGS_FOR_BUILD="${CPPFLAGS}" \
                 CXX_FOR_BUILD="${CXX}" \
                 CXXFLAGS_FOR_BUILD="${CXXFLAGS}" \
                 LDFLAGS_FOR_BUILD="${LDFLAGS}"
 INSTALL_TARGET=	install-strip
 
 INFO=		flex
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES NLS
 OPTIONS_SUB=	yes
 NLS_USES=	gettext iconv
 NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -Ee 's/tests//' \
 		-e '/mode=compile ..CC/s/\\$$/-fPIC -DPIC &/' \
 		${WRKSRC}/Makefile.in
 	${RM} ${WRKSRC}/doc/*.info*
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -r ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}/
 	${RM} ${STAGEDIR}${EXAMPLESDIR}/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/textproc/flex/pkg-plist b/textproc/flex/pkg-plist
index d99a31d6c35c..57f56b445b61 100644
--- a/textproc/flex/pkg-plist
+++ b/textproc/flex/pkg-plist
@@ -1,28 +1,28 @@
 bin/flex
 bin/flex++
 include/flex/FlexLexer.h
 lib/libfl.a
-man/man1/flex.1.gz
+share/man/man1/flex.1.gz
 %%NLS%%share/locale/ca/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/da/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/de/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/en@boldquot/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/en@quot/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/es/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/flex.mo