diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 0f18b9988e1c..7dff4e466211 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -1,70 +1,81 @@
 # Created by: Bruce M Simpson
 # $FreeBSD$
 
 PORTNAME=	opensc
 PORTVERSION=	0.14.0
 CATEGORIES=	security devel
 MASTER_SITES=	SF/${PORTNAME}/OpenSC/${DISTNAME}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Libraries and utilities to access smart cards
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
-
 OPTIONS_SINGLE=	BACKEND
 OPTIONS_SINGLE_BACKEND=PCSC OPENCT CTAPI
-OPTIONS_DEFINE=	SM DOCS
-OPTIONS_DEFAULT=PCSC SM
+OPTIONS_DEFINE=	SM DOCS MANPAGES
+OPTIONS_DEFAULT=PCSC SM MANPAGES
 
 PCSC_DESC=	Use PC/SC backend
 OPENCT_DESC=	Use OpenCT backend
 CTAPI_DESC=	Use CT-API backend
 SM_DESC=	Enable secure messaging support
 
 USES=		libtool pkgconfig gmake
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ENV=	\
 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
-		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" \
-		XSLTPROC="${LOCALBASE}/bin/xsltproc"
-
-CONFIGURE_ARGS=	--with-xsl-stylesheetsdir=${LOCALBASE}/share/xsl/docbook
+		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
 
 PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
+BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
+		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+CONFIGURE_ENV+=	XSLTPROC="${LOCALBASE}/bin/xsltproc"
+CONFIGURE_ARGS+=--with-xsl-stylesheetsdir=${LOCALBASE}/share/xsl/docbook
+.else
+CONFIGURE_ENV+=	XSLTPROC="${FALSE}"
+CONFIGURE_ARGS+=--without-xsl-stylesheetsdir
+.endif
+
+.if ${PORT_OPTIONS:MMANPAGES}
+PLIST_SUB+=	MANPAGES=""
+.else
+CONFIGURE_ARGS+=--disable-man
+PLIST_SUB+=	MANPAGES="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MOPENCT}
 LIB_DEPENDS+=	libopenct.so:${PORTSDIR}/security/openct
 CONFIGURE_ARGS+=--enable-openct
 .endif
 
 .if ${PORT_OPTIONS:MPCSC}
 LIB_DEPENDS+=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
 .else
 CONFIGURE_ARGS+=--disable-pcsc
 .endif
 
 .if ${PORT_OPTIONS:MCTAPI}
 CONFIGURE_ARGS+=--enable-ctapi
 .endif
 
 .if ${PORT_OPTIONS:MSM}
 PLIST_SUB+=	SM=""
 .else
 CONFIGURE_ARGS+=--disable-sm
 PLIST_SUB+=	SM="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=--enable-doc
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/opensc/pkg-plist b/security/opensc/pkg-plist
index 86824f0e15f0..0ac02bb5c4be 100644
--- a/security/opensc/pkg-plist
+++ b/security/opensc/pkg-plist
@@ -1,78 +1,76 @@
 bin/cardos-tool
 bin/cryptoflex-tool
 bin/dnie-tool
 bin/eidenv
 bin/iasecc-tool
 bin/netkey-tool
 bin/openpgp-tool
 bin/opensc-explorer
 bin/opensc-tool
 bin/piv-tool
 bin/pkcs11-tool
 bin/pkcs15-crypt
 bin/pkcs15-init
 bin/pkcs15-tool
 bin/sc-hsm-tool
 bin/westcos-tool
 etc/opensc.conf-sample
 lib/libopensc.a
 lib/libopensc.so
 lib/libopensc.so.3
 lib/libopensc.so.3.0.0
 %%SM%%lib/libsmm-local.a
 %%SM%%lib/libsmm-local.so
 %%SM%%lib/libsmm-local.so.3
 %%SM%%lib/libsmm-local.so.3.0.0
 lib/onepin-opensc-pkcs11.so
 lib/opensc-pkcs11.so
 lib/pkcs11-spy.so
 lib/pkcs11/onepin-opensc-pkcs11.so
 lib/pkcs11/opensc-pkcs11.so
 lib/pkcs11/pkcs11-spy.so
 %%DATADIR%%/asepcos.profile
 %%DATADIR%%/authentic.profile
 %%DATADIR%%/cardos.profile
 %%DATADIR%%/cyberflex.profile
 %%DATADIR%%/entersafe.profile
 %%DATADIR%%/epass2003.profile
 %%DATADIR%%/flex.profile
 %%DATADIR%%/gpk.profile
 %%DATADIR%%/ias_adele_admin1.profile
 %%DATADIR%%/ias_adele_admin2.profile
 %%DATADIR%%/ias_adele_common.profile
 %%DATADIR%%/iasecc_admin_eid.profile
 %%DATADIR%%/iasecc_generic_oberthur.profile
 %%DATADIR%%/iasecc_generic_pki.profile
 %%DATADIR%%/iasecc.profile
 %%DATADIR%%/incrypto34.profile
 %%DATADIR%%/jcop.profile
 %%DATADIR%%/miocos.profile
 %%DATADIR%%/muscle.profile
 %%DATADIR%%/myeid.profile
 %%DATADIR%%/oberthur.profile
 %%DATADIR%%/openpgp.profile
 %%DATADIR%%/pkcs15.profile
 %%DATADIR%%/rutoken.profile
 %%DATADIR%%/rutoken_ecp.profile
 %%DATADIR%%/sc-hsm.profile
 %%DATADIR%%/setcos.profile
 %%DATADIR%%/starcos.profile
 %%DATADIR%%/westcos.profile
-man/man1/cardos-tool.1.gz
-man/man1/cryptoflex-tool.1.gz
-man/man1/eidenv.1.gz
-man/man1/iasecc-tool.1.gz
-man/man1/netkey-tool.1.gz
-man/man1/openpgp-tool.1.gz
-man/man1/opensc-explorer.1.gz
-man/man1/opensc-tool.1.gz
-man/man1/piv-tool.1.gz
-man/man1/pkcs11-tool.1.gz
-man/man1/pkcs15-crypt.1.gz
-man/man1/pkcs15-init.1.gz
-man/man1/pkcs15-tool.1.gz
-man/man1/sc-hsm-tool.1.gz
-man/man1/westcos-tool.1.gz
-man/man5/pkcs15-profile.5.gz
-@dirrm lib/pkcs11
-@dirrm %%DATADIR%%
+%%MANPAGES%%man/man1/cardos-tool.1.gz
+%%MANPAGES%%man/man1/cryptoflex-tool.1.gz
+%%MANPAGES%%man/man1/eidenv.1.gz
+%%MANPAGES%%man/man1/iasecc-tool.1.gz
+%%MANPAGES%%man/man1/netkey-tool.1.gz
+%%MANPAGES%%man/man1/openpgp-tool.1.gz
+%%MANPAGES%%man/man1/opensc-explorer.1.gz
+%%MANPAGES%%man/man1/opensc-tool.1.gz
+%%MANPAGES%%man/man1/piv-tool.1.gz
+%%MANPAGES%%man/man1/pkcs11-tool.1.gz
+%%MANPAGES%%man/man1/pkcs15-crypt.1.gz
+%%MANPAGES%%man/man1/pkcs15-init.1.gz
+%%MANPAGES%%man/man1/pkcs15-tool.1.gz
+%%MANPAGES%%man/man1/sc-hsm-tool.1.gz
+%%MANPAGES%%man/man1/westcos-tool.1.gz
+%%MANPAGES%%man/man5/pkcs15-profile.5.gz