diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index b7c26d00e047..f0f6c5f3b449 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -1,70 +1,71 @@
 PORTNAME=	dbus
 DISTVERSION=	1.14.10
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	https://dbus.freedesktop.org/releases/dbus/
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Message bus system for inter-application communication
 WWW=		https://www.freedesktop.org/Software/dbus
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		cpe gmake libtool localbase pkgconfig python:build shebangfix tar:xz
 CPE_VENDOR=	d-bus_project
 CPE_PRODUCT=	d-bus
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	dbus
 SHEBANG_FILES=	tools/GetAllMatchRules.py
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--disable-apparmor \
 		--disable-doxygen-docs \
 		--disable-selinux \
 		--disable-systemd \
 		--with-session-socket-dir=/tmp \
 		--with-test-socket-dir=${WRKDIR}
 CONFIGURE_ENV=	have_ld_version_script=yes
 
 INSTALL_TARGET=	install-strip
 
 PORTSCOUT=	limitw:1,even
 
 USERS=		messagebus
 GROUPS=		messagebus
 
 _LIBVERSION=	3.32.4
 
 PLIST_SUB=	GROUPS=${GROUPS} \
 		VERSION="1.0" \
 		LIBVERSION=${_LIBVERSION}
 
 OPTIONS_DEFINE=		EXAMPLES MANPAGES X11
 OPTIONS_DEFAULT=	MANPAGES X11
 OPTIONS_SUB=		yes
 X11_DESC=		Support X11 Desktop Environments
 
 MANPAGES_BUILD_DEPENDS=		minixmlto:textproc/minixmlto
 MANPAGES_CONFIGURE_ENV=		XMLTO=${LOCALBASE}/bin/minixmlto
 MANPAGES_CONFIGURE_ENABLE=	xml-docs
 X11_USES=			xorg
 X11_USE=			XORG=ice,sm,x11
 X11_CONFIGURE_WITH=		x
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/dbus/dbus-sysdeps-util-unix.c
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${MV} ${STAGEDIR}${DOCSDIR}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 	${RM} -r ${STAGEDIR}${DOCSDIR}
 .for file in session.conf system.conf
 	@cd ${STAGEDIR}${ETCDIR}-1/ && \
 		${MV} ${file} ${file}.sample
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
index 18ba55d4ff48..88d7ae6655c5 100644
--- a/devel/dbus/pkg-plist
+++ b/devel/dbus/pkg-plist
@@ -1,62 +1,62 @@
 bin/dbus-cleanup-sockets
 bin/dbus-daemon
 bin/dbus-launch
 bin/dbus-monitor
 bin/dbus-run-session
 bin/dbus-send
 bin/dbus-test-tool
 bin/dbus-update-activation-environment
 bin/dbus-uuidgen
 @sample etc/dbus-1/session.conf.sample
 @sample etc/dbus-1/system.conf.sample
 include/dbus-%%VERSION%%/dbus/dbus-address.h
 include/dbus-%%VERSION%%/dbus/dbus-bus.h
 include/dbus-%%VERSION%%/dbus/dbus-connection.h
 include/dbus-%%VERSION%%/dbus/dbus-errors.h
 include/dbus-%%VERSION%%/dbus/dbus-macros.h
 include/dbus-%%VERSION%%/dbus/dbus-memory.h
 include/dbus-%%VERSION%%/dbus/dbus-message.h
 include/dbus-%%VERSION%%/dbus/dbus-misc.h
 include/dbus-%%VERSION%%/dbus/dbus-pending-call.h
 include/dbus-%%VERSION%%/dbus/dbus-protocol.h
 include/dbus-%%VERSION%%/dbus/dbus-server.h
 include/dbus-%%VERSION%%/dbus/dbus-shared.h
 include/dbus-%%VERSION%%/dbus/dbus-signature.h
 include/dbus-%%VERSION%%/dbus/dbus-syntax.h
 include/dbus-%%VERSION%%/dbus/dbus-threads.h
 include/dbus-%%VERSION%%/dbus/dbus-types.h
 include/dbus-%%VERSION%%/dbus/dbus.h
 lib/cmake/DBus1/DBus1Config.cmake
 lib/cmake/DBus1/DBus1ConfigVersion.cmake
 lib/dbus-%%VERSION%%/include/dbus/dbus-arch-deps.h
 lib/libdbus-1.a
 lib/libdbus-1.so
 lib/libdbus-1.so.3
 lib/libdbus-1.so.%%LIBVERSION%%
 libdata/pkgconfig/dbus-1.pc
 @(,%%GROUPS%%,4750) libexec/dbus-daemon-launch-helper
-%%MANPAGES%%man/man1/dbus-cleanup-sockets.1.gz
-%%MANPAGES%%man/man1/dbus-daemon.1.gz
-%%MANPAGES%%man/man1/dbus-launch.1.gz
-%%MANPAGES%%man/man1/dbus-monitor.1.gz
-%%MANPAGES%%man/man1/dbus-run-session.1.gz
-%%MANPAGES%%man/man1/dbus-send.1.gz
-%%MANPAGES%%man/man1/dbus-test-tool.1.gz
-%%MANPAGES%%man/man1/dbus-update-activation-environment.1.gz
-%%MANPAGES%%man/man1/dbus-uuidgen.1.gz
+%%MANPAGES%%share/man/man1/dbus-cleanup-sockets.1.gz
+%%MANPAGES%%share/man/man1/dbus-daemon.1.gz
+%%MANPAGES%%share/man/man1/dbus-launch.1.gz
+%%MANPAGES%%share/man/man1/dbus-monitor.1.gz
+%%MANPAGES%%share/man/man1/dbus-run-session.1.gz
+%%MANPAGES%%share/man/man1/dbus-send.1.gz
+%%MANPAGES%%share/man/man1/dbus-test-tool.1.gz
+%%MANPAGES%%share/man/man1/dbus-update-activation-environment.1.gz
+%%MANPAGES%%share/man/man1/dbus-uuidgen.1.gz
 share/dbus-1/session.conf
 share/dbus-1/system.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/GetAllMatchRules.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-session-disable-stats.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-system-enable-stats.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-system-hardening-without-traditional-activation.conf
 share/xml/dbus-1/busconfig.dtd
 share/xml/dbus-1/catalog.xml
 share/xml/dbus-1/introspect.dtd
 @dir share/dbus-1/services
 @dir share/dbus-1/session.d
 @dir share/dbus-1/system-services
 @dir share/dbus-1/system.d
 @dir /var/lib/dbus
 @dir /var/lib
 @dir /var/run/dbus