diff --git a/devel/elfutils/Makefile b/devel/elfutils/Makefile
index 16a76e20256a..9af8a11e8ad3 100644
--- a/devel/elfutils/Makefile
+++ b/devel/elfutils/Makefile
@@ -1,63 +1,65 @@
 PORTNAME=	elfutils
 DISTVERSION=	0.187
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://sourceware.org/elfutils/ftp/${PORTVERSION}/
 
 MAINTAINER=	cem@FreeBSD.org
 COMMENT=	Library for manipulating ELF files and partial implementation of binutils
 WWW=		https://sourceware.org/elfutils/
 
 LICENSE=	LGPL3 GPLv2+ GPLv3+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING-GPLV2
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING-LGPLV3
 
 BROKEN_armv6=		fails to build: fails to compile i386_disasm.c
 
 LIB_DEPENDS=	libargp.so:devel/argp-standalone \
 		libcurl.so:ftp/curl
 BUILD_DEPENDS=	gnulib>=0:devel/gnulib
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 # Although the following line is synonymous to USES=localbase
 # it breaks the build
 CFLAGS+=	-I${LOCALBASE}/include \
 		-I${LOCALBASE}/share/gnulib/lib \
 		-DFREEBSD_HAS_MEMPCPY
 LDFLAGS+=	${LOCALBASE}/lib/libargp.so \
 		${LOCALBASE}/lib/libintl.so
 
 OPTIONS_DEFINE=	MANPAGES NLS
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 NLS_USES_OFF=	gettext  # used anyway
 NLS_CONFIGURE_ENABLE=	nls
 
 USES=		autoreconf cpe gmake libtool pkgconfig tar:bzip2
 CPE_VENDOR=	${PORTNAME}_project
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-Wno-error -Wno-format-nonliteral
 CFLAGS+=	-Wno-null-dereference -Wno-unused-value
 
 # Avoid conflict with binutils / elftoolchain programs with the same names:
 CONFIGURE_ARGS+=	--program-prefix=eu-
 # Disable debuginfod until option support can be added:
 CONFIGURE_ARGS+=	--disable-debuginfod
 
 pre-configure:
 	@${CP} -a \
 	    ${LOCALBASE}/share/gnulib/lib/obstack.c \
 	    ${LOCALBASE}/share/gnulib/lib/obstack.h \
 	    ${LOCALBASE}/share/gnulib/lib/obstack_printf.c \
 	    ${WRKSRC}/lib
 
 post-configure: # remove -Werror since it causes build failures
 	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e 's| -Werror| |; s|-Werror ||'
 
 .include <bsd.port.mk>
diff --git a/devel/elfutils/pkg-plist b/devel/elfutils/pkg-plist
index dc90b20d20a6..588a2925700d 100644
--- a/devel/elfutils/pkg-plist
+++ b/devel/elfutils/pkg-plist
@@ -1,73 +1,73 @@
 bin/debuginfod-find
 bin/eu-addr2line
 bin/eu-ar
 bin/eu-elfclassify
 bin/eu-elfcmp
 bin/eu-elfcompress
 bin/eu-elflint
 bin/eu-findtextrel
 bin/eu-make-debug-archive
 bin/eu-nm
 bin/eu-objdump
 bin/eu-ranlib
 bin/eu-readelf
 bin/eu-size
 bin/eu-stack
 bin/eu-strings
 bin/eu-strip
 bin/eu-unstrip
 include/dwarf.h
 include/elfutils/debuginfod.h
 include/elfutils/elf-knowledge.h
 include/elfutils/known-dwarf.h
 include/elfutils/libasm.h
 include/elfutils/libdw.h
 include/elfutils/libdwelf.h
 include/elfutils/libdwfl.h
 include/elfutils/version.h
 include/gelf.h
 include/libelf.h
 include/nlist.h
 lib/libasm-%%VERSION%%.so
 lib/libasm.a
 lib/libasm.so
 lib/libasm.so.1
 lib/libdebuginfod-%%VERSION%%.so
 lib/libdebuginfod.so
 lib/libdebuginfod.so.1
 lib/libdw-%%VERSION%%.so
 lib/libdw.a
 lib/libdw.so
 lib/libdw.so.1
 lib/libelf-%%VERSION%%.so
 lib/libelf.a
 lib/libelf.so
 lib/libelf.so.1
 libdata/pkgconfig/libdebuginfod.pc
 libdata/pkgconfig/libdw.pc
 libdata/pkgconfig/libelf.pc
-%%MANPAGES%%man/man1/debuginfod-find.1.gz
-%%MANPAGES%%man/man1/eu-elfclassify.1.gz
-%%MANPAGES%%man/man1/eu-readelf.1.gz
-%%MANPAGES%%man/man3/debuginfod_add_http_header.3.gz
-%%MANPAGES%%man/man3/debuginfod_begin.3.gz
-%%MANPAGES%%man/man3/debuginfod_end.3.gz
-%%MANPAGES%%man/man3/debuginfod_find_debuginfo.3.gz
-%%MANPAGES%%man/man3/debuginfod_find_executable.3.gz
-%%MANPAGES%%man/man3/debuginfod_find_source.3.gz
-%%MANPAGES%%man/man3/debuginfod_get_url.3.gz
-%%MANPAGES%%man/man3/debuginfod_get_user_data.3.gz
-%%MANPAGES%%man/man3/debuginfod_set_progressfn.3.gz
-%%MANPAGES%%man/man3/debuginfod_set_user_data.3.gz
-%%MANPAGES%%man/man3/elf_begin.3.gz
-%%MANPAGES%%man/man3/elf_clone.3.gz
-%%MANPAGES%%man/man3/elf_getdata.3.gz
-%%MANPAGES%%man/man3/elf_update.3.gz
-%%MANPAGES%%man/man7/debuginfod-client-config.7.gz
+%%MANPAGES%%share/man/man1/debuginfod-find.1.gz
+%%MANPAGES%%share/man/man1/eu-elfclassify.1.gz
+%%MANPAGES%%share/man/man1/eu-readelf.1.gz
+%%MANPAGES%%share/man/man3/debuginfod_add_http_header.3.gz
+%%MANPAGES%%share/man/man3/debuginfod_begin.3.gz
+%%MANPAGES%%share/man/man3/debuginfod_end.3.gz
+%%MANPAGES%%share/man/man3/debuginfod_find_debuginfo.3.gz
+%%MANPAGES%%share/man/man3/debuginfod_find_executable.3.gz
+%%MANPAGES%%share/man/man3/debuginfod_find_source.3.gz
+%%MANPAGES%%share/man/man3/debuginfod_get_url.3.gz
+%%MANPAGES%%share/man/man3/debuginfod_get_user_data.3.gz
+%%MANPAGES%%share/man/man3/debuginfod_set_progressfn.3.gz
+%%MANPAGES%%share/man/man3/debuginfod_set_user_data.3.gz
+%%MANPAGES%%share/man/man3/elf_begin.3.gz
+%%MANPAGES%%share/man/man3/elf_clone.3.gz
+%%MANPAGES%%share/man/man3/elf_getdata.3.gz
+%%MANPAGES%%share/man/man3/elf_update.3.gz
+%%MANPAGES%%share/man/man7/debuginfod-client-config.7.gz
 %%NLS%%share/locale/de/LC_MESSAGES/elfutils.mo
 %%NLS%%share/locale/en@boldquot/LC_MESSAGES/elfutils.mo
 %%NLS%%share/locale/en@quot/LC_MESSAGES/elfutils.mo
 %%NLS%%share/locale/es/LC_MESSAGES/elfutils.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/elfutils.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/elfutils.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/elfutils.mo