diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index 6a9d97c3cbde..e7b595283985 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	xfsprogs
-PORTVERSION=	3.2.4
-PORTREVISION=	3
+DISTVERSION=	3.2.4
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://oss.sgi.com/projects/xfs/cmd_tars/ \
 		ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities for managing XFS filesystems
 WWW=		http://oss.sgi.com/projects/xfs/
 
 LICENSE=	LGPL21 GPLv2
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
-CPE_PRODUCT=	${PORTNAME}
-CPE_VENDOR=	sgi
 USES=		cpe gettext gmake libtool:build readline
+CPE_VENDOR=	sgi
+CPE_PRODUCT=	${PORTNAME}
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV=	OPTIMIZER=-fcommon
 CONFIGURE_ARGS=	--disable-shared --enable-readline
 ALL_TARGET=	# empty
 MAKE_ARGS=	V=1
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e '/utmp/d' \
 		${WRKSRC}/quota/report.c ${WRKSRC}/quota/util.c
 	@${REINPLACE_CMD} \
 		-e 's|/usr/local|${LOCALBASE}|g' \
 		-e 's/lio_listio/timer_create/' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/#!/s|bash|sh|' \
 		${WRKSRC}/include/install-sh ${WRKSRC}/install-sh
 
 post-install:
 .for f in mkfs.xfs xfs_copy xfs_db xfs_estimate xfs_fsr xfs_growfs xfs_io \
      xfs_logprint xfs_mdrestore xfs_quota xfs_repair xfs_rtcp
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/${f}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfsprogs/pkg-plist b/sysutils/xfsprogs/pkg-plist
index 7472a3a1b702..7b0c0fdc61a6 100644
--- a/sysutils/xfsprogs/pkg-plist
+++ b/sysutils/xfsprogs/pkg-plist
@@ -1,49 +1,49 @@
-man/man5/projects.5.gz
-man/man5/projid.5.gz
-man/man5/xfs.5.gz
-man/man8/fsck.xfs.8.gz
-man/man8/mkfs.xfs.8.gz
-man/man8/xfs_admin.8.gz
-man/man8/xfs_bmap.8.gz
-man/man8/xfs_copy.8.gz
-man/man8/xfs_db.8.gz
-man/man8/xfs_estimate.8.gz
-man/man8/xfs_freeze.8.gz
-man/man8/xfs_fsr.8.gz
-man/man8/xfs_growfs.8.gz
-man/man8/xfs_info.8.gz
-man/man8/xfs_io.8.gz
-man/man8/xfs_logprint.8.gz
-man/man8/xfs_mdrestore.8.gz
-man/man8/xfs_metadump.8.gz
-man/man8/xfs_mkfile.8.gz
-man/man8/xfs_ncheck.8.gz
-man/man8/xfs_quota.8.gz
-man/man8/xfs_repair.8.gz
-man/man8/xfs_rtcp.8.gz
+share/man/man5/projects.5.gz
+share/man/man5/projid.5.gz
+share/man/man5/xfs.5.gz
+share/man/man8/fsck.xfs.8.gz
+share/man/man8/mkfs.xfs.8.gz
+share/man/man8/xfs_admin.8.gz
+share/man/man8/xfs_bmap.8.gz
+share/man/man8/xfs_copy.8.gz
+share/man/man8/xfs_db.8.gz
+share/man/man8/xfs_estimate.8.gz
+share/man/man8/xfs_freeze.8.gz
+share/man/man8/xfs_fsr.8.gz
+share/man/man8/xfs_growfs.8.gz
+share/man/man8/xfs_info.8.gz
+share/man/man8/xfs_io.8.gz
+share/man/man8/xfs_logprint.8.gz
+share/man/man8/xfs_mdrestore.8.gz
+share/man/man8/xfs_metadump.8.gz
+share/man/man8/xfs_mkfile.8.gz
+share/man/man8/xfs_ncheck.8.gz
+share/man/man8/xfs_quota.8.gz
+share/man/man8/xfs_repair.8.gz
+share/man/man8/xfs_rtcp.8.gz
 sbin/fsck.xfs
 sbin/mkfs.xfs
 sbin/xfs_admin
 sbin/xfs_bmap
 sbin/xfs_copy
 sbin/xfs_db
 sbin/xfs_estimate
 sbin/xfs_freeze
 sbin/xfs_fsr
 sbin/xfs_growfs
 sbin/xfs_info
 sbin/xfs_io
 sbin/xfs_logprint
 sbin/xfs_mdrestore
 sbin/xfs_metadump
 sbin/xfs_mkfile
 sbin/xfs_ncheck
 sbin/xfs_quota
 sbin/xfs_repair
 sbin/xfs_rtcp
 share/locale/de/LC_MESSAGES/xfsprogs.mo
 share/locale/pl/LC_MESSAGES/xfsprogs.mo
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.gz
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README