diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index ee7c2b06525e..ddbc51299501 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -1,24 +1,27 @@
 PORTNAME=	libXpm
 PORTVERSION=	3.5.17
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Pixmap library
 WWW=		https://www.freedesktop.org/Software/xlibs
 
 LICENSE=	MIT
 
 USES=		cpe tar:xz xorg xorg-cat:lib
 USE_XORG=	xorgproto x11 xext xt
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 CPE_VENDOR=	libxpm_project
 
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+
 OPTIONS_DEFINE=		NLS
 NLS_USES=		gettext
 NLS_CONFIGURE_ENV_OFF=	ac_cv_search_gettext=no
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 .include <bsd.port.mk>
diff --git a/x11/libXpm/pkg-plist b/x11/libXpm/pkg-plist
index 3fdeba6eb3dd..a21a4c6aa961 100644
--- a/x11/libXpm/pkg-plist
+++ b/x11/libXpm/pkg-plist
@@ -1,51 +1,51 @@
 bin/cxpm
 bin/sxpm
 include/X11/xpm.h
 lib/libXpm.a
 lib/libXpm.so
 lib/libXpm.so.4
 lib/libXpm.so.4.11.0
 libdata/pkgconfig/xpm.pc
-man/man1/cxpm.1.gz
-man/man1/sxpm.1.gz
-man/man3/XpmAttributesSize.3.gz
-man/man3/XpmCreateBuffer.3.gz
-man/man3/XpmCreateBufferFromImage.3.gz
-man/man3/XpmCreateBufferFromPixmap.3.gz
-man/man3/XpmCreateBufferFromXpmImage.3.gz
-man/man3/XpmCreateData.3.gz
-man/man3/XpmCreateDataFromImage.3.gz
-man/man3/XpmCreateDataFromPixmap.3.gz
-man/man3/XpmCreateDataFromXpmImage.3.gz
-man/man3/XpmCreateImage.3.gz
-man/man3/XpmCreateImageFromBuffer.3.gz
-man/man3/XpmCreateImageFromData.3.gz
-man/man3/XpmCreateImageFromXpmImage.3.gz
-man/man3/XpmCreatePixmap.3.gz
-man/man3/XpmCreatePixmapFromBuffer.3.gz
-man/man3/XpmCreatePixmapFromData.3.gz
-man/man3/XpmCreatePixmapFromXpmImage.3.gz
-man/man3/XpmCreateXpmImage.3.gz
-man/man3/XpmCreateXpmImageFromBuffer.3.gz
-man/man3/XpmCreateXpmImageFromData.3.gz
-man/man3/XpmCreateXpmImageFromImage.3.gz
-man/man3/XpmCreateXpmImageFromPixmap.3.gz
-man/man3/XpmFree.3.gz
-man/man3/XpmFreeAttributes.3.gz
-man/man3/XpmFreeExtensions.3.gz
-man/man3/XpmFreeXpmImage.3.gz
-man/man3/XpmFreeXpmInfo.3.gz
-man/man3/XpmGetErrorString.3.gz
-man/man3/XpmLibraryVersion.3.gz
-man/man3/XpmMisc.3.gz
-man/man3/XpmRead.3.gz
-man/man3/XpmReadFileToBuffer.3.gz
-man/man3/XpmReadFileToData.3.gz
-man/man3/XpmReadFileToImage.3.gz
-man/man3/XpmReadFileToPixmap.3.gz
-man/man3/XpmReadFileToXpmImage.3.gz
-man/man3/XpmWrite.3.gz
-man/man3/XpmWriteFileFromBuffer.3.gz
-man/man3/XpmWriteFileFromImage.3.gz
-man/man3/XpmWriteFileFromPixmap.3.gz
-man/man3/XpmWriteFileFromXpmImage.3.gz
+share/man/man1/cxpm.1.gz
+share/man/man1/sxpm.1.gz
+share/man/man3/XpmAttributesSize.3.gz
+share/man/man3/XpmCreateBuffer.3.gz
+share/man/man3/XpmCreateBufferFromImage.3.gz
+share/man/man3/XpmCreateBufferFromPixmap.3.gz
+share/man/man3/XpmCreateBufferFromXpmImage.3.gz
+share/man/man3/XpmCreateData.3.gz
+share/man/man3/XpmCreateDataFromImage.3.gz
+share/man/man3/XpmCreateDataFromPixmap.3.gz
+share/man/man3/XpmCreateDataFromXpmImage.3.gz
+share/man/man3/XpmCreateImage.3.gz
+share/man/man3/XpmCreateImageFromBuffer.3.gz
+share/man/man3/XpmCreateImageFromData.3.gz
+share/man/man3/XpmCreateImageFromXpmImage.3.gz
+share/man/man3/XpmCreatePixmap.3.gz
+share/man/man3/XpmCreatePixmapFromBuffer.3.gz
+share/man/man3/XpmCreatePixmapFromData.3.gz
+share/man/man3/XpmCreatePixmapFromXpmImage.3.gz
+share/man/man3/XpmCreateXpmImage.3.gz
+share/man/man3/XpmCreateXpmImageFromBuffer.3.gz
+share/man/man3/XpmCreateXpmImageFromData.3.gz
+share/man/man3/XpmCreateXpmImageFromImage.3.gz
+share/man/man3/XpmCreateXpmImageFromPixmap.3.gz
+share/man/man3/XpmFree.3.gz
+share/man/man3/XpmFreeAttributes.3.gz
+share/man/man3/XpmFreeExtensions.3.gz
+share/man/man3/XpmFreeXpmImage.3.gz
+share/man/man3/XpmFreeXpmInfo.3.gz
+share/man/man3/XpmGetErrorString.3.gz
+share/man/man3/XpmLibraryVersion.3.gz
+share/man/man3/XpmMisc.3.gz
+share/man/man3/XpmRead.3.gz
+share/man/man3/XpmReadFileToBuffer.3.gz
+share/man/man3/XpmReadFileToData.3.gz
+share/man/man3/XpmReadFileToImage.3.gz
+share/man/man3/XpmReadFileToPixmap.3.gz
+share/man/man3/XpmReadFileToXpmImage.3.gz
+share/man/man3/XpmWrite.3.gz
+share/man/man3/XpmWriteFileFromBuffer.3.gz
+share/man/man3/XpmWriteFileFromImage.3.gz
+share/man/man3/XpmWriteFileFromPixmap.3.gz
+share/man/man3/XpmWriteFileFromXpmImage.3.gz