diff --git a/security/tpm-tools/Makefile b/security/tpm-tools/Makefile
index 256ccc14768bb..046854dd8149b 100644
--- a/security/tpm-tools/Makefile
+++ b/security/tpm-tools/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tpm-tools
 PORTVERSION=	1.3.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF/trousers/${PORTNAME}/${PORTVERSION}
 
@@ -23,6 +23,7 @@ USE_LDCONFIG=	YES
 
 NO_WRKSUBDIR=	YES
 GNU_CONFIGURE=	YES
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 LIBS+=		-L${LOCALBASE}/lib -lintl
 INSTALL_TARGET=	install-strip
 
diff --git a/security/tpm-tools/pkg-plist b/security/tpm-tools/pkg-plist
index 6e6cf28cbccac..a0d42e25a6ee5 100644
--- a/security/tpm-tools/pkg-plist
+++ b/security/tpm-tools/pkg-plist
@@ -9,36 +9,6 @@ include/tpm_tools/tpm_unseal.h
 lib/libtpm_unseal.so
 lib/libtpm_unseal.so.1
 lib/libtpm_unseal.so.1.0.0
-man/man1/tpm_sealdata.1.gz
-man/man1/tpm_version.1.gz
-man/man1/tpmtoken_import.1.gz
-man/man1/tpmtoken_init.1.gz
-man/man1/tpmtoken_objects.1.gz
-man/man1/tpmtoken_protect.1.gz
-man/man1/tpmtoken_setpasswd.1.gz
-man/man3/tpmUnsealFile.3.gz
-man/man3/tpmUnsealShred.3.gz
-man/man3/tpmUnsealStrerror.3.gz
-man/man8/tpm_changeownerauth.8.gz
-man/man8/tpm_clear.8.gz
-man/man8/tpm_createek.8.gz
-man/man8/tpm_getpubek.8.gz
-man/man8/tpm_nvdefine.8.gz
-man/man8/tpm_nvinfo.8.gz
-man/man8/tpm_nvread.8.gz
-man/man8/tpm_nvrelease.8.gz
-man/man8/tpm_nvwrite.8.gz
-man/man8/tpm_resetdalock.8.gz
-man/man8/tpm_restrictpubek.8.gz
-man/man8/tpm_revokeek.8.gz
-man/man8/tpm_selftest.8.gz
-man/man8/tpm_setactive.8.gz
-man/man8/tpm_setclearable.8.gz
-man/man8/tpm_setenable.8.gz
-man/man8/tpm_setoperatorauth.8.gz
-man/man8/tpm_setownable.8.gz
-man/man8/tpm_setpresence.8.gz
-man/man8/tpm_takeownership.8.gz
 sbin/tpm_changeownerauth
 sbin/tpm_clear
 sbin/tpm_createek
@@ -61,3 +31,33 @@ sbin/tpm_setownable
 sbin/tpm_setpresence
 sbin/tpm_takeownership
 sbin/tpm_version
+share/man/man1/tpm_sealdata.1.gz
+share/man/man1/tpm_version.1.gz
+share/man/man1/tpmtoken_import.1.gz
+share/man/man1/tpmtoken_init.1.gz
+share/man/man1/tpmtoken_objects.1.gz
+share/man/man1/tpmtoken_protect.1.gz
+share/man/man1/tpmtoken_setpasswd.1.gz
+share/man/man3/tpmUnsealFile.3.gz
+share/man/man3/tpmUnsealShred.3.gz
+share/man/man3/tpmUnsealStrerror.3.gz
+share/man/man8/tpm_changeownerauth.8.gz
+share/man/man8/tpm_clear.8.gz
+share/man/man8/tpm_createek.8.gz
+share/man/man8/tpm_getpubek.8.gz
+share/man/man8/tpm_nvdefine.8.gz
+share/man/man8/tpm_nvinfo.8.gz
+share/man/man8/tpm_nvread.8.gz
+share/man/man8/tpm_nvrelease.8.gz
+share/man/man8/tpm_nvwrite.8.gz
+share/man/man8/tpm_resetdalock.8.gz
+share/man/man8/tpm_restrictpubek.8.gz
+share/man/man8/tpm_revokeek.8.gz
+share/man/man8/tpm_selftest.8.gz
+share/man/man8/tpm_setactive.8.gz
+share/man/man8/tpm_setclearable.8.gz
+share/man/man8/tpm_setenable.8.gz
+share/man/man8/tpm_setoperatorauth.8.gz
+share/man/man8/tpm_setownable.8.gz
+share/man/man8/tpm_setpresence.8.gz
+share/man/man8/tpm_takeownership.8.gz