diff --git a/security/oath-toolkit/Makefile b/security/oath-toolkit/Makefile
index 1d9cefe55cbf2..645c44354cd54 100644
--- a/security/oath-toolkit/Makefile
+++ b/security/oath-toolkit/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	oath-toolkit
 PORTVERSION=	2.6.9
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SAVANNAH
 
@@ -13,6 +14,7 @@ LICENSE_COMB=	multi
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
 		--disable-pam-tests
 USES=		gmake libtool pathfix pkgconfig
diff --git a/security/oath-toolkit/pkg-plist b/security/oath-toolkit/pkg-plist
index e31111626b5cf..9fb069ad4cf78 100644
--- a/security/oath-toolkit/pkg-plist
+++ b/security/oath-toolkit/pkg-plist
@@ -20,139 +20,139 @@ lib/liboath.so.0.1.3
 lib/security/pam_oath.so
 libdata/pkgconfig/liboath.pc
 %%PSKC%%libdata/pkgconfig/libpskc.pc
-man/man1/oathtool.1.gz
-%%PSKC%%man/man1/pskctool.1.gz
-man/man3/oath_authenticate_usersfile.3.gz
-man/man3/oath_base32_decode.3.gz
-man/man3/oath_base32_encode.3.gz
-man/man3/oath_bin2hex.3.gz
-man/man3/oath_check_version.3.gz
-man/man3/oath_done.3.gz
-man/man3/oath_hex2bin.3.gz
-man/man3/oath_hotp_generate.3.gz
-man/man3/oath_hotp_validate.3.gz
-man/man3/oath_hotp_validate_callback.3.gz
-man/man3/oath_init.3.gz
-man/man3/oath_strerror.3.gz
-man/man3/oath_strerror_name.3.gz
-man/man3/oath_totp_generate.3.gz
-man/man3/oath_totp_generate2.3.gz
-man/man3/oath_totp_validate.3.gz
-man/man3/oath_totp_validate2.3.gz
-man/man3/oath_totp_validate4.3.gz
-man/man3/oath_totp_validate2_callback.3.gz
-man/man3/oath_totp_validate4_callback.3.gz
-man/man3/oath_totp_validate3.3.gz
-man/man3/oath_totp_validate3_callback.3.gz
-man/man3/oath_totp_validate_callback.3.gz
-%%PSKC%%man/man3/pskc_add_keypackage.3.gz
-%%PSKC%%man/man3/pskc_build_xml.3.gz
-%%PSKC%%man/man3/pskc_check_version.3.gz
-%%PSKC%%man/man3/pskc_done.3.gz
-%%PSKC%%man/man3/pskc_free.3.gz
-%%PSKC%%man/man3/pskc_get_cryptomodule_id.3.gz
-%%PSKC%%man/man3/pskc_get_device_devicebinding.3.gz
-%%PSKC%%man/man3/pskc_get_device_expirydate.3.gz
-%%PSKC%%man/man3/pskc_get_device_issueno.3.gz
-%%PSKC%%man/man3/pskc_get_device_manufacturer.3.gz
-%%PSKC%%man/man3/pskc_get_device_model.3.gz
-%%PSKC%%man/man3/pskc_get_device_serialno.3.gz
-%%PSKC%%man/man3/pskc_get_device_startdate.3.gz
-%%PSKC%%man/man3/pskc_get_device_userid.3.gz
-%%PSKC%%man/man3/pskc_get_id.3.gz
-%%PSKC%%man/man3/pskc_get_key_algorithm.3.gz
-%%PSKC%%man/man3/pskc_get_key_algparm_chall_checkdigits.3.gz
-%%PSKC%%man/man3/pskc_get_key_algparm_chall_encoding.3.gz
-%%PSKC%%man/man3/pskc_get_key_algparm_chall_max.3.gz
-%%PSKC%%man/man3/pskc_get_key_algparm_chall_min.3.gz
-%%PSKC%%man/man3/pskc_get_key_algparm_resp_checkdigits.3.gz
-%%PSKC%%man/man3/pskc_get_key_algparm_resp_encoding.3.gz
-%%PSKC%%man/man3/pskc_get_key_algparm_resp_length.3.gz
-%%PSKC%%man/man3/pskc_get_key_algparm_suite.3.gz
-%%PSKC%%man/man3/pskc_get_key_data_b64secret.3.gz
-%%PSKC%%man/man3/pskc_get_key_data_counter.3.gz
-%%PSKC%%man/man3/pskc_get_key_data_secret.3.gz
-%%PSKC%%man/man3/pskc_get_key_data_time.3.gz
-%%PSKC%%man/man3/pskc_get_key_data_timedrift.3.gz
-%%PSKC%%man/man3/pskc_get_key_data_timeinterval.3.gz
-%%PSKC%%man/man3/pskc_get_key_friendlyname.3.gz
-%%PSKC%%man/man3/pskc_get_key_id.3.gz
-%%PSKC%%man/man3/pskc_get_key_issuer.3.gz
-%%PSKC%%man/man3/pskc_get_key_policy_expirydate.3.gz
-%%PSKC%%man/man3/pskc_get_key_policy_keyusages.3.gz
-%%PSKC%%man/man3/pskc_get_key_policy_numberoftransactions.3.gz
-%%PSKC%%man/man3/pskc_get_key_policy_pinencoding.3.gz
-%%PSKC%%man/man3/pskc_get_key_policy_pinkeyid.3.gz
-%%PSKC%%man/man3/pskc_get_key_policy_pinmaxfailedattempts.3.gz
-%%PSKC%%man/man3/pskc_get_key_policy_pinmaxlength.3.gz
-%%PSKC%%man/man3/pskc_get_key_policy_pinminlength.3.gz
-%%PSKC%%man/man3/pskc_get_key_policy_pinusagemode.3.gz
-%%PSKC%%man/man3/pskc_get_key_policy_startdate.3.gz
-%%PSKC%%man/man3/pskc_get_key_profileid.3.gz
-%%PSKC%%man/man3/pskc_get_key_reference.3.gz
-%%PSKC%%man/man3/pskc_get_key_userid.3.gz
-%%PSKC%%man/man3/pskc_get_keypackage.3.gz
-%%PSKC%%man/man3/pskc_get_signed_p.3.gz
-%%PSKC%%man/man3/pskc_get_version.3.gz
-%%PSKC%%man/man3/pskc_global_done.3.gz
-%%PSKC%%man/man3/pskc_global_init.3.gz
-%%PSKC%%man/man3/pskc_global_log.3.gz
-%%PSKC%%man/man3/pskc_init.3.gz
-%%PSKC%%man/man3/pskc_keyusage2str.3.gz
-%%PSKC%%man/man3/pskc_output.3.gz
-%%PSKC%%man/man3/pskc_parse_from_memory.3.gz
-%%PSKC%%man/man3/pskc_pinusagemode2str.3.gz
-%%PSKC%%man/man3/pskc_set_cryptomodule_id.3.gz
-%%PSKC%%man/man3/pskc_set_device_devicebinding.3.gz
-%%PSKC%%man/man3/pskc_set_device_expirydate.3.gz
-%%PSKC%%man/man3/pskc_set_device_issueno.3.gz
-%%PSKC%%man/man3/pskc_set_device_manufacturer.3.gz
-%%PSKC%%man/man3/pskc_set_device_model.3.gz
-%%PSKC%%man/man3/pskc_set_device_serialno.3.gz
-%%PSKC%%man/man3/pskc_set_device_startdate.3.gz
-%%PSKC%%man/man3/pskc_set_device_userid.3.gz
-%%PSKC%%man/man3/pskc_set_id.3.gz
-%%PSKC%%man/man3/pskc_set_key_algorithm.3.gz
-%%PSKC%%man/man3/pskc_set_key_algparm_chall_checkdigits.3.gz
-%%PSKC%%man/man3/pskc_set_key_algparm_chall_encoding.3.gz
-%%PSKC%%man/man3/pskc_set_key_algparm_chall_max.3.gz
-%%PSKC%%man/man3/pskc_set_key_algparm_chall_min.3.gz
-%%PSKC%%man/man3/pskc_set_key_algparm_resp_checkdigits.3.gz
-%%PSKC%%man/man3/pskc_set_key_algparm_resp_encoding.3.gz
-%%PSKC%%man/man3/pskc_set_key_algparm_resp_length.3.gz
-%%PSKC%%man/man3/pskc_set_key_algparm_suite.3.gz
-%%PSKC%%man/man3/pskc_set_key_data_b64secret.3.gz
-%%PSKC%%man/man3/pskc_set_key_data_counter.3.gz
-%%PSKC%%man/man3/pskc_set_key_data_secret.3.gz
-%%PSKC%%man/man3/pskc_set_key_data_time.3.gz
-%%PSKC%%man/man3/pskc_set_key_data_timedrift.3.gz
-%%PSKC%%man/man3/pskc_set_key_data_timeinterval.3.gz
-%%PSKC%%man/man3/pskc_set_key_friendlyname.3.gz
-%%PSKC%%man/man3/pskc_set_key_id.3.gz
-%%PSKC%%man/man3/pskc_set_key_issuer.3.gz
-%%PSKC%%man/man3/pskc_set_key_policy_expirydate.3.gz
-%%PSKC%%man/man3/pskc_set_key_policy_keyusages.3.gz
-%%PSKC%%man/man3/pskc_set_key_policy_numberoftransactions.3.gz
-%%PSKC%%man/man3/pskc_set_key_policy_pinencoding.3.gz
-%%PSKC%%man/man3/pskc_set_key_policy_pinkeyid.3.gz
-%%PSKC%%man/man3/pskc_set_key_policy_pinmaxfailedattempts.3.gz
-%%PSKC%%man/man3/pskc_set_key_policy_pinmaxlength.3.gz
-%%PSKC%%man/man3/pskc_set_key_policy_pinminlength.3.gz
-%%PSKC%%man/man3/pskc_set_key_policy_pinusagemode.3.gz
-%%PSKC%%man/man3/pskc_set_key_policy_startdate.3.gz
-%%PSKC%%man/man3/pskc_set_key_profileid.3.gz
-%%PSKC%%man/man3/pskc_set_key_reference.3.gz
-%%PSKC%%man/man3/pskc_set_key_userid.3.gz
-%%PSKC%%man/man3/pskc_set_version.3.gz
-%%PSKC%%man/man3/pskc_sign_x509.3.gz
-%%PSKC%%man/man3/pskc_str2keyusage.3.gz
-%%PSKC%%man/man3/pskc_str2pinusagemode.3.gz
-%%PSKC%%man/man3/pskc_str2valueformat.3.gz
-%%PSKC%%man/man3/pskc_strerror.3.gz
-%%PSKC%%man/man3/pskc_strerror_name.3.gz
-%%PSKC%%man/man3/pskc_validate.3.gz
-%%PSKC%%man/man3/pskc_valueformat2str.3.gz
-%%PSKC%%man/man3/pskc_verify_x509crt.3.gz
+share/man/man1/oathtool.1.gz
+%%PSKC%%share/man/man1/pskctool.1.gz
+share/man/man3/oath_authenticate_usersfile.3.gz
+share/man/man3/oath_base32_decode.3.gz
+share/man/man3/oath_base32_encode.3.gz
+share/man/man3/oath_bin2hex.3.gz
+share/man/man3/oath_check_version.3.gz
+share/man/man3/oath_done.3.gz
+share/man/man3/oath_hex2bin.3.gz
+share/man/man3/oath_hotp_generate.3.gz
+share/man/man3/oath_hotp_validate.3.gz
+share/man/man3/oath_hotp_validate_callback.3.gz
+share/man/man3/oath_init.3.gz
+share/man/man3/oath_strerror.3.gz
+share/man/man3/oath_strerror_name.3.gz
+share/man/man3/oath_totp_generate.3.gz
+share/man/man3/oath_totp_generate2.3.gz
+share/man/man3/oath_totp_validate.3.gz
+share/man/man3/oath_totp_validate2.3.gz
+share/man/man3/oath_totp_validate4.3.gz
+share/man/man3/oath_totp_validate2_callback.3.gz
+share/man/man3/oath_totp_validate4_callback.3.gz
+share/man/man3/oath_totp_validate3.3.gz
+share/man/man3/oath_totp_validate3_callback.3.gz
+share/man/man3/oath_totp_validate_callback.3.gz
+%%PSKC%%share/man/man3/pskc_add_keypackage.3.gz
+%%PSKC%%share/man/man3/pskc_build_xml.3.gz
+%%PSKC%%share/man/man3/pskc_check_version.3.gz
+%%PSKC%%share/man/man3/pskc_done.3.gz
+%%PSKC%%share/man/man3/pskc_free.3.gz
+%%PSKC%%share/man/man3/pskc_get_cryptomodule_id.3.gz
+%%PSKC%%share/man/man3/pskc_get_device_devicebinding.3.gz
+%%PSKC%%share/man/man3/pskc_get_device_expirydate.3.gz
+%%PSKC%%share/man/man3/pskc_get_device_issueno.3.gz
+%%PSKC%%share/man/man3/pskc_get_device_manufacturer.3.gz
+%%PSKC%%share/man/man3/pskc_get_device_model.3.gz
+%%PSKC%%share/man/man3/pskc_get_device_serialno.3.gz
+%%PSKC%%share/man/man3/pskc_get_device_startdate.3.gz
+%%PSKC%%share/man/man3/pskc_get_device_userid.3.gz
+%%PSKC%%share/man/man3/pskc_get_id.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_algorithm.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_algparm_chall_checkdigits.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_algparm_chall_encoding.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_algparm_chall_max.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_algparm_chall_min.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_algparm_resp_checkdigits.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_algparm_resp_encoding.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_algparm_resp_length.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_algparm_suite.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_data_b64secret.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_data_counter.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_data_secret.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_data_time.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_data_timedrift.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_data_timeinterval.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_friendlyname.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_id.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_issuer.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_policy_expirydate.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_policy_keyusages.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_policy_numberoftransactions.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_policy_pinencoding.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_policy_pinkeyid.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_policy_pinmaxfailedattempts.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_policy_pinmaxlength.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_policy_pinminlength.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_policy_pinusagemode.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_policy_startdate.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_profileid.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_reference.3.gz
+%%PSKC%%share/man/man3/pskc_get_key_userid.3.gz
+%%PSKC%%share/man/man3/pskc_get_keypackage.3.gz
+%%PSKC%%share/man/man3/pskc_get_signed_p.3.gz
+%%PSKC%%share/man/man3/pskc_get_version.3.gz
+%%PSKC%%share/man/man3/pskc_global_done.3.gz
+%%PSKC%%share/man/man3/pskc_global_init.3.gz
+%%PSKC%%share/man/man3/pskc_global_log.3.gz
+%%PSKC%%share/man/man3/pskc_init.3.gz
+%%PSKC%%share/man/man3/pskc_keyusage2str.3.gz
+%%PSKC%%share/man/man3/pskc_output.3.gz
+%%PSKC%%share/man/man3/pskc_parse_from_memory.3.gz
+%%PSKC%%share/man/man3/pskc_pinusagemode2str.3.gz
+%%PSKC%%share/man/man3/pskc_set_cryptomodule_id.3.gz
+%%PSKC%%share/man/man3/pskc_set_device_devicebinding.3.gz
+%%PSKC%%share/man/man3/pskc_set_device_expirydate.3.gz
+%%PSKC%%share/man/man3/pskc_set_device_issueno.3.gz
+%%PSKC%%share/man/man3/pskc_set_device_manufacturer.3.gz
+%%PSKC%%share/man/man3/pskc_set_device_model.3.gz
+%%PSKC%%share/man/man3/pskc_set_device_serialno.3.gz
+%%PSKC%%share/man/man3/pskc_set_device_startdate.3.gz
+%%PSKC%%share/man/man3/pskc_set_device_userid.3.gz
+%%PSKC%%share/man/man3/pskc_set_id.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_algorithm.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_algparm_chall_checkdigits.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_algparm_chall_encoding.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_algparm_chall_max.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_algparm_chall_min.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_algparm_resp_checkdigits.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_algparm_resp_encoding.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_algparm_resp_length.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_algparm_suite.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_data_b64secret.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_data_counter.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_data_secret.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_data_time.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_data_timedrift.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_data_timeinterval.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_friendlyname.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_id.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_issuer.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_policy_expirydate.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_policy_keyusages.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_policy_numberoftransactions.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_policy_pinencoding.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_policy_pinkeyid.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_policy_pinmaxfailedattempts.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_policy_pinmaxlength.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_policy_pinminlength.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_policy_pinusagemode.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_policy_startdate.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_profileid.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_reference.3.gz
+%%PSKC%%share/man/man3/pskc_set_key_userid.3.gz
+%%PSKC%%share/man/man3/pskc_set_version.3.gz
+%%PSKC%%share/man/man3/pskc_sign_x509.3.gz
+%%PSKC%%share/man/man3/pskc_str2keyusage.3.gz
+%%PSKC%%share/man/man3/pskc_str2pinusagemode.3.gz
+%%PSKC%%share/man/man3/pskc_str2valueformat.3.gz
+%%PSKC%%share/man/man3/pskc_strerror.3.gz
+%%PSKC%%share/man/man3/pskc_strerror_name.3.gz
+%%PSKC%%share/man/man3/pskc_validate.3.gz
+%%PSKC%%share/man/man3/pskc_valueformat2str.3.gz
+%%PSKC%%share/man/man3/pskc_verify_x509crt.3.gz
 %%PSKC%%share/xml/pskc/catalog-pskc.xml
 %%PSKC%%share/xml/pskc/pskc-schema.xsd
 %%PSKC%%share/xml/pskc/xenc-schema.xsd