diff --git a/security/shibboleth-sp/Makefile b/security/shibboleth-sp/Makefile
index 6f7cd3f1f9dd..90a4c0c3e2dd 100644
--- a/security/shibboleth-sp/Makefile
+++ b/security/shibboleth-sp/Makefile
@@ -1,92 +1,92 @@
 PORTNAME=	shibboleth-sp
 PORTVERSION=	3.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security www
 MASTER_SITES=	http://shibboleth.net/downloads/service-provider/${PORTVERSION}/
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	C++ Shibboleth Service Provider (Internet2) for Apache
 WWW=		http://shibboleth.internet2.edu/
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	boost-libs>=0:devel/boost-libs
 LIB_DEPENDS=	libsaml.so:security/opensaml \
 		liblog4shib.so:devel/log4shib \
 		libxerces-c-3.2.so:textproc/xerces-c3 \
 		libxml-security-c.so:security/apache-xml-security-c \
 		libxmltooling.so:devel/xmltooling \
 		libapr-1.so:devel/apr1 \
 		libgdbm.so:databases/gdbm \
 		libexpat.so:textproc/expat2
 
 USES=		gmake tar:bzip2 cpe pkgconfig libtool bdb
 USE_CXXSTD=	c++14
 
 GNU_CONFIGURE=	yes
 MAKE_ENV=	NOKEYGEN=YES
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	shibboleth-sp
 DOCSDIR=	${PREFIX}/share/doc/shibboleth
 CPE_VENDOR=	shibboleth
 
 USERS=		shibd
 GROUPS=		shibd
 
 INSTALL_TARGET=	install-strip
 
 OPTIONS_GROUP=	CONNECT SESSION
 OPTIONS_GROUP_CONNECT=FASTCGI APACHE
 CONNECT_DESC=	Webserver modules
 
 OPTIONS_GROUP_SESSION=ODBC # broken MEMCACHED
 SESSION_DESC=	Optional session storage
 
 OPTIONS_DEFAULT=ODBC APACHE
 
 # Descriptions
 ODBC_DESC=	ODBC database backend - store sessions in a database
 # broken MEMCACHED_DESC=	Store sessions in memcached
 FASTCGI_DESC=	FastCGI protocol support, e.g. for NGINX
 APACHE_DESC=	Build Apache module
 
 APACHE_USES=	apache
 
 ODBC_CONFIGURE_ENABLE=	odbc
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 FASTCGI_CONFIGURE_WITH=	fastcgi=${LOCALBASE}
 FASTCGI_LIB_DEPENDS=	libfcgi++.so:www/fcgi
 
 #MEMCACHED_CONFIGURE_WITH=	memcached=${LOCALBASE}
 #MEMCACHED_LIB_DEPENDS=		libmemcached.so:databases/libmemcached
 
 OPTIONS_SUB=	yes
 
 SUB_LIST+=	SH=${SH} WWWGRP=${WWWGRP}
 PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 SUB_LIST+=	SHIBD_USER=${USERS}
 SUB_LIST+=	SHIBD_GROUP=${GROUPS}
 PLIST_SUB+=	SHIBD_USER=${USERS}
 PLIST_SUB+=	SHIBD_GROUP=${GROUPS}
 
 CONFIGURE_ARGS+=--localstatedir=/var \
 	       	--disable-doxygen-doc --disable-dependency-tracking
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MAPACHE} && "${APACHE_VERSION}" == 2.4
 CONFIGURE_ARGS+=--disable-apache-22 --enable-apache-24 --with-apxs24=${APXS}
 PLIST_SUB+=	WITH_APACHE_24=""
 .else
 CONFIGURE_ARGS+=--disable-apache-24 --disable-apache-22
 PLIST_SUB+=	WITH_APACHE_24="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,^pkgdocdir.*=.*,pkgdocdir = ${DOCSDIR},' \
 		-e 's,^pkgwebdir.*=.*,pkgwebdir = ${DOCSDIR},' \
 		${WRKSRC}/doc/Makefile.in ${WRKSRC}/configs/Makefile.in
 
 .include <bsd.port.post.mk>
diff --git a/security/shibboleth-sp/files/shibboleth-sp.in b/security/shibboleth-sp/files/shibboleth-sp.in
index 5979c6f440ed..aa6b6af005e8 100644
--- a/security/shibboleth-sp/files/shibboleth-sp.in
+++ b/security/shibboleth-sp/files/shibboleth-sp.in
@@ -1,56 +1,56 @@
 #!/bin/sh
 
 # PROVIDE: shibboleth_sp
 # REQUIRE: DAEMON
 #
 
 . /etc/rc.subr
 
 name="shibboleth_sp"
 rcvar=shibboleth_sp_enable
 
 : ${shibboleth_sp_enable:='NO'}
 : ${shibboleth_sp_flags:=''}
 
 command=${shibboleth_sp_program:-%%PREFIX%%/sbin/shibd}
 pidfile="${shibboleth_sp_pidfile:-/var/run/shibboleth/${name}.pid}"
 start_precmd="shibboleth_sp_configtest"
 restart_precmd="shibboleth_sp_configtest"
 configtest_cmd="shibboleth_sp_configtest"
 keygen_cmd="shibboleth_sp_keygen"
 
 shibboleth_sp_usr=%%SHIBD_USER%%
 shibboleth_sp_group=%%SHIBD_GROUP%%
-www_group=%%WWWGRP%%
+: ${shibboleth_www_group:=%%WWWGRP%%}
 
 load_rc_config $name
 
 command_args="-f -p ${pidfile} -u ${shibboleth_sp_usr} -g ${shibboleth_sp_group}"
 confdir=${SHIBSP_CFGDIR:-%%PREFIX%%/etc}/shibboleth
 cert=sp-cert.pem
 key=sp-key.pem
 
 shibboleth_sp_configtest() {
 	if [ ! -s ${confdir}/${key} -o ! -s ${confdir}/${cert} ]; then
 		run_rc_command keygen
 	else
 		# update from 2.4.x, chown %%SHIBD_USER%% the key and cert
 	       	chown ${shibboleth_sp_usr}:${shibboleth_sp_group} ${confdir}/${key} ${confdir}/${cert}
 		chmod 400 ${confdir}/${key}
 		chmod 444 ${confdir}/${cert}
 	fi
 	# In FreeBSD 10 (r258664), /var/cache mode is corrected to 755. make sure we have that mode.
 	chmod 755 /var/cache
 	install -d -o ${shibboleth_sp_usr} -g ${shibboleth_sp_group} /var/log/shibboleth
 	install -d -o ${shibboleth_sp_usr} -g ${shibboleth_sp_group} /var/cache/shibboleth
-	install -d -o ${shibboleth_sp_usr} -g ${www_group} -m 750 /var/run/shibboleth
+	install -d -o ${shibboleth_sp_usr} -g ${shibboleth_www_group} -m 750 /var/run/shibboleth
 	${command} ${shibboleth_sp_flags} -u ${shibboleth_sp_usr} -g ${shibboleth_sp_group} -t
 }
 
 shibboleth_sp_keygen() {
 	%%SH%% ${confdir}/keygen.sh -o ${confdir} -u ${shibboleth_sp_usr} -g ${shibboleth_sp_group}
 }
 
 extra_commands="configtest keygen"
 
 run_rc_command "$1"