diff --git a/security/stoken/Makefile b/security/stoken/Makefile
index fa54a33243c8..1ef6edbd40f6 100644
--- a/security/stoken/Makefile
+++ b/security/stoken/Makefile
@@ -1,35 +1,36 @@
 PORTNAME=	stoken
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.93
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 
 MAINTAINER=	samm@FreeBSD.org
 COMMENT=	Software Token for UNIX compatible with RSA SecurID
 WWW=		https://sourceforge.net/p/stoken/wiki/Home/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
 LIB_DEPENDS=	libtomcrypt.so:security/libtomcrypt # can alternatively use nettle, potentially port option can be created
 
 USES=		gnome libtool localbase pkgconfig autoreconf
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	stoken-dev
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS X11
 OPTIONS_SUB=	yes
 
 X11_CONFIGURE_WITH=	gtk
 X11_DESC=	Build GUI token interface
 X11_USE=	GNOME=gtk30,cairo,gdkpixbuf2
 X11_USES=	desktop-file-utils
 
 do-test: build
 	cd ${WRKSRC} && ${MAKE} check
 
 .include <bsd.port.mk>
diff --git a/security/stoken/pkg-plist b/security/stoken/pkg-plist
index 2d82cf04b878..3c66a05683ab 100644
--- a/security/stoken/pkg-plist
+++ b/security/stoken/pkg-plist
@@ -1,20 +1,20 @@
 bin/stoken
 %%X11%%bin/stoken-gui
 include/stoken.h
 lib/libstoken.a
 lib/libstoken.so
 lib/libstoken.so.1
 lib/libstoken.so.1.3.0
-%%X11%%man/man1/stoken-gui.1.gz
-man/man1/stoken.1.gz
+%%X11%%share/man/man1/stoken-gui.1.gz
+share/man/man1/stoken.1.gz
 %%X11%%share/applications/stoken-gui-small.desktop
 %%X11%%share/applications/stoken-gui.desktop
 %%X11%%%%DATADIR%%/password-dialog.ui
 %%X11%%%%DATADIR%%/pin-dialog.ui
 %%X11%%%%DATADIR%%/tokencode-detail.ui
 %%X11%%%%DATADIR%%/tokencode-small.ui
 %%X11%%share/pixmaps/stoken-gui.png
 libdata/pkgconfig/stoken.pc
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/libstoken-test.c
 %%PORTDOCS%%%%DOCSDIR%%/sdtid-test.pl