diff --git a/security/shibboleth-sp/Makefile b/security/shibboleth-sp/Makefile
index 45213b136e7e..b2975708b058 100644
--- a/security/shibboleth-sp/Makefile
+++ b/security/shibboleth-sp/Makefile
@@ -1,90 +1,91 @@
 # Created by: Janos Mohacsi <janos.mohacsi@bsd.hu>
 
 PORTNAME=	shibboleth-sp
 PORTVERSION=	3.3.0
+PORTREVISION=	1
 CATEGORIES=	security www
 MASTER_SITES=	http://shibboleth.net/downloads/service-provider/${PORTVERSION}/
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	C++ Shibboleth Service Provider (Internet2) for Apache
 
 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
 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 MEMCACHED
 SESSION_DESC=	Optional session storage
 
 OPTIONS_DEFAULT=ODBC APACHE
 
 # Descriptions
 ODBC_DESC=	ODBC database backend - store sessions in a database
 MEMCACHED_DESC=	Store sessions in memcached
 FASTCGI_DESC=	FastCGI protocol support, e.g. for NGINX
 APACHE_DESC=	Build Apache module
 
 APACHE_USES=	apache:2.4+
 
 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/patch-apache__mod_shib_cpp b/security/shibboleth-sp/files/patch-apache__mod_shib_cpp
new file mode 100644
index 000000000000..681b195a738a
--- /dev/null
+++ b/security/shibboleth-sp/files/patch-apache__mod_shib_cpp
@@ -0,0 +1,26 @@
+From: Scott Cantor <cantor.2@osu.edu>
+Date: Tue, 30 Nov 2021 17:38:09 +0000 (-0500)
+Subject: SSPCPP-948 - mod_shib warning about Apache 1.3 in log
+X-Git-Url: https://git.shibboleth.net/view/?p=cpp-sp.git;a=commitdiff_plain;h=7b5c7aced15c0be5404bcba0bcec4c586323fba9
+
+SSPCPP-948 - mod_shib warning about Apache 1.3 in log
+
+https://shibboleth.atlassian.net/browse/SSPCPP-948
+---
+
+diff --git a/apache/mod_shib.cpp b/apache/mod_shib.cpp
+index 6b1dc676..1a1f2543 100644
+--- apache/mod_shib.cpp
++++ apache/mod_shib.cpp
+@@ -1983,10 +1983,10 @@ extern "C" void shib_child_init(apr_pool_t* p, server_rec* s)
+     // Initialize runtime components.
+ 
+     ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, SH_AP_R(s), "child_init: mod_shib initializing in pid (%d)", (int)getpid());
+-    ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, SH_AP_R(s), "DEPRECATED: Apache 1.3 module, please upgrade to Apache 2.4+");
+ 
+     // 2.x versions have already initialized the libraries.
+ #ifdef SHIB_APACHE_13
++    ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, SH_AP_R(s), "DEPRECATED: Apache 1.3 module, please upgrade to Apache 2.4+");
+     if (g_Config) {
+         ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, SH_AP_R(s), "child_init: mod_shib already initialized, exiting");
+         exit(1);