diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 1ee511498980..33a61e81fcdb 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -1,29 +1,31 @@
 PORTNAME=	popt
 PORTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://ftp.osuosl.org/pub/rpm/popt/releases/popt-1.x/ \
 		http://ftp.rpm.org/popt/releases/popt-1.x/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Getopt(3) like library with a number of enhancements, from Redhat
 WWW=		https://github.com/rpm-software-management/popt
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cpe iconv libtool pathfix
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	popt_project
 
 OPTIONS_DEFINE=	NLS
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext-runtime localbase
 OPTIONS_SUB=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/popt/pkg-plist b/devel/popt/pkg-plist
index eff18fe8a6f4..0806a3a9b2bd 100644
--- a/devel/popt/pkg-plist
+++ b/devel/popt/pkg-plist
@@ -1,43 +1,43 @@
 include/popt.h
 lib/libpopt.a
 lib/libpopt.so
 lib/libpopt.so.0
 lib/libpopt.so.0.0.2
 libdata/pkgconfig/popt.pc
-man/man3/popt.3.gz
+share/man/man3/popt.3.gz
 %%NLS%%share/locale/ca/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/da/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/de/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/es/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/id/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/is/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/it/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/si/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/th/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/wa/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/popt.mo