diff --git a/sysutils/libudisks/Makefile b/sysutils/libudisks/Makefile
index 392f774bc138..e9ad96120377 100644
--- a/sysutils/libudisks/Makefile
+++ b/sysutils/libudisks/Makefile
@@ -1,65 +1,67 @@
 PORTNAME=	libudisks
 DISTVERSION=	2.10.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/storaged-project/udisks/releases/download/udisks-${DISTVERSION}/
 DISTNAME=	udisks-${DISTVERSION}
 
 MAINTAINER=	pauamma@gundo.com
 COMMENT=	Library to manipulate storage devices, from udisks
 WWW=		https://www.freedesktop.org/wiki/Software/udisks/
 
 LICENSE=	GPLv2+ LGPL20+
 # LGPL for libudisks, GPL for the command-line utilities.
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # pkaction takes care of libpolkit-agent-1 and libpolkit-gobject-1
 # which are what we really want (see UDISKSCTL_LIB_DEPENDS).
 BUILD_DEPENDS=	bash:shells/bash \
 		pkaction:sysutils/polkit
 
 # For some reason, configure wants autopoint from gettext-tools even when
 # NLS is disabled.
 USES=		gettext-tools:build gmake gnome libtool pathfix pkgconfig \
 		tar:bz2
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 # --with-libintl-prefix is needed because otherwise
 # configure won't find libintl when PREFIX != LOCALBASE.
 CONFIGURE_ARGS=	--disable-daemon \
 		--with-html-dir=${PREFIX}/share/doc \
 		--with-libintl-prefix=${LOCALBASE}
 
 DOCSDIR=	${PREFIX}/share/doc/udisks2
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		UDISKSCTL NLS DOCS
 OPTIONS_DEFAULT=	UDISKSCTL NLS DOCS
 OPTIONS_SUB=		yes
 
 UDISKSCTL_DESC=		Install udisksctl command line utility
 
 NLS_USES=		gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 
 UDISKSCTL_BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc \
 				xsltproc:textproc/libxslt
 UDISKSCTL_LIB_DEPENDS=		libpolkit-agent-1.so:sysutils/polkit \
 				libpolkit-gobject-1.so:sysutils/polkit
 UDISKSCTL_CONFIGURE_ENABLE=	man
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libudisks2.so.0.0.0
 
 post-install-UDISKSCTL-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/udisksctl
 
 # Pacify "make stage-qa".
 post-install-UDISKSCTL-off:
 	${RM} ${STAGEDIR}${PREFIX}/bin/udisksctl
 
 .include <bsd.port.mk>
diff --git a/sysutils/libudisks/pkg-plist b/sysutils/libudisks/pkg-plist
index 2350c7e79b58..f152c62cc9c3 100644
--- a/sysutils/libudisks/pkg-plist
+++ b/sysutils/libudisks/pkg-plist
@@ -1,88 +1,88 @@
 %%UDISKSCTL%%bin/udisksctl
 include/udisks2/udisks/udisks-generated.h
 include/udisks2/udisks/udisks.h
 include/udisks2/udisks/udisksclient.h
 include/udisks2/udisks/udisksenums.h
 include/udisks2/udisks/udisksenumtypes.h
 include/udisks2/udisks/udiskserror.h
 include/udisks2/udisks/udisksobjectinfo.h
 include/udisks2/udisks/udiskstypes.h
 include/udisks2/udisks/udisksversion.h
 lib/libudisks2.a
 lib/libudisks2.so
 lib/libudisks2.so.0
 lib/libudisks2.so.0.0.0
 libdata/pkgconfig/udisks2.pc
-%%UDISKSCTL%%man/man1/udisksctl.1.gz
+%%UDISKSCTL%%share/man/man1/udisksctl.1.gz
 %%UDISKSCTL%%share/bash-completion/completions/udisksctl
 %%NLS%%share/locale/af/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/as/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/az/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/bn_IN/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/cy/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/da/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/de/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/el/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/es/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/et/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/fa/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/fo/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/fur/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/gu/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/he/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/hi/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/ia/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/id/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/it/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/kn/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/ml/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/mr/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/oc/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/or/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/sr@latin/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/ta/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/te/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/th/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/wa/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/zh_HK/LC_MESSAGES/udisks2.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/udisks2.mo
 share/zsh/site-functions/_udisks2