diff --git a/security/opensaml2/Makefile b/security/opensaml2/Makefile
index bbbc8297a752..1f947d5e888e 100644
--- a/security/opensaml2/Makefile
+++ b/security/opensaml2/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opensaml2
-PORTVERSION=	2.5.3
-PORTREVISION=	2
+PORTVERSION=	2.5.4
 CATEGORIES=	security
 MASTER_SITES=	http://shibboleth.net/downloads/c++-opensaml/${PORTVERSION}/
 DISTNAME=	opensaml-${PORTVERSION}
diff --git a/security/opensaml2/distinfo b/security/opensaml2/distinfo
index aa99d850fcb8..289aaeed5bbd 100644
--- a/security/opensaml2/distinfo
+++ b/security/opensaml2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opensaml-2.5.3.tar.gz) = 1ed6a241b2021def6a1af57d3087b697c98b38842e9195e1f3fae194d55c13fb
-SIZE (opensaml-2.5.3.tar.gz) = 703021
+SHA256 (opensaml-2.5.4.tar.gz) = 562d3b5fe7b29aefbad9d5910508baf2edcb87327e51a4f239076e54663763e6
+SIZE (opensaml-2.5.4.tar.gz) = 738788
diff --git a/security/opensaml2/pkg-plist b/security/opensaml2/pkg-plist
index 35d6ea5b89f0..f5eaef54c063 100644
--- a/security/opensaml2/pkg-plist
+++ b/security/opensaml2/pkg-plist
@@ -49,13 +49,13 @@ include/saml/util/CommonDomainCookie.h
 include/saml/util/SAMLConstants.h
 lib/libsaml.so
 lib/libsaml.so.8
-lib/libsaml.so.8.0.3
+lib/libsaml.so.8.0.4
 libdata/pkgconfig/opensaml.pc
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
 %%PORTDOCS%%%%DOCSDIR%%/LOG4CPP.LICENSE
-%%PORTDOCS%%@comment @dir %%DOCSDIR%%/api
+%%PORTDOCS%%@dir %%DOCSDIR%%/api
 share/xml/opensaml/saml20-catalog.xml
 share/xml/opensaml/saml10-catalog.xml
 share/xml/opensaml/saml11-catalog.xml
diff --git a/security/shibboleth2-sp/Makefile b/security/shibboleth2-sp/Makefile
index e4f3a87f2449..b94e6fb745b4 100644
--- a/security/shibboleth2-sp/Makefile
+++ b/security/shibboleth2-sp/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	shibboleth-sp
-PORTVERSION=	2.5.3
-PORTREVISION=	2
+PORTVERSION=	2.5.4
 CATEGORIES=	security www
 MASTER_SITES=	http://shibboleth.net/downloads/service-provider/${PORTVERSION}/
 
@@ -24,7 +23,7 @@ LATEST_LINK=	shibboleth2-sp
 USERS=		shibd
 GROUPS=		shibd
 
-USE_APACHE=	22-24
+USE_APACHE=	22+
 USE_OPENSSL=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/security/shibboleth2-sp/distinfo b/security/shibboleth2-sp/distinfo
index e3eed002d308..ab471b6a31ac 100644
--- a/security/shibboleth2-sp/distinfo
+++ b/security/shibboleth2-sp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (shibboleth-sp-2.5.3.tar.gz) = 82acd1d5989560cafb93860e6bf11fc61aaf78adb439435dea7381d94d677918
-SIZE (shibboleth-sp-2.5.3.tar.gz) = 949273
+SHA256 (shibboleth-sp-2.5.4.tar.gz) = be0adfb324d1831e55b2ce281c7f8bd27bb9bdd65f1d0e9d8019e4cde1ceb6bb
+SIZE (shibboleth-sp-2.5.4.tar.gz) = 993532
diff --git a/security/shibboleth2-sp/pkg-plist b/security/shibboleth2-sp/pkg-plist
index ce41132352e7..13e029f36cc9 100644
--- a/security/shibboleth2-sp/pkg-plist
+++ b/security/shibboleth2-sp/pkg-plist
@@ -58,6 +58,7 @@ etc/shibboleth/protocols.xml.dist
 @unexec if cmp -s %D/etc/shibboleth/security-policy.xml.dist %D/etc/shibboleth/security-policy.xml; then rm -f %D/etc/shibboleth/security-policy.xml; fi
 etc/shibboleth/security-policy.xml.dist
 @exec if [ ! -f %D/etc/shibboleth/security-policy.xml ] ; then cp -p %D/etc/shibboleth/security-policy.xml.dist %D/etc/shibboleth/security-policy.xml; fi
+etc/shibboleth/shibd-amazon
 etc/shibboleth/shibd-redhat
 etc/shibboleth/shibd-debian
 etc/shibboleth/shibd-suse
@@ -135,6 +136,7 @@ include/shibsp/util/PropertySet.h
 include/shibsp/util/SPConstants.h
 include/shibsp/util/TemplateParameters.h
 include/shibsp/version.h
+lib/libshibsp.so.6.0.4
 lib/libshibsp.so.6
 lib/libshibsp.so
 lib/shibboleth/adfs.so
@@ -144,6 +146,7 @@ lib/shibboleth/plugins-lite.so
 lib/shibboleth/plugins.so
 %%WITH_APACHE_22%%lib/shibboleth/mod_shib_22.so
 %%WITH_APACHE_24%%lib/shibboleth/mod_shib_24.so
+lib/libshibsp-lite.so.6.0.4
 lib/libshibsp-lite.so.6
 lib/libshibsp-lite.so
 sbin/shibd
@@ -167,29 +170,30 @@ share/doc/shibboleth/OPENSSL.LICENSE
 share/doc/shibboleth/README.txt
 share/doc/shibboleth/RELEASE.txt
 share/doc/shibboleth/main.css
-@dirrmtry share/doc/shibboleth/api
-@dirrmtry share/doc/shibboleth
-@dirrmtry lib/shibboleth
-@dirrmtry share/xml/shibboleth
-@dirrmtry include/shibsp/util
-@dirrmtry include/shibsp/security
-@dirrmtry include/shibsp/remoting
-@dirrmtry include/shibsp/metadata
-@dirrmtry include/shibsp/lite
-@dirrmtry include/shibsp/handler
-@dirrmtry include/shibsp/binding
-@dirrmtry include/shibsp/attribute/resolver
-@dirrmtry include/shibsp/attribute/filtering
-@dirrmtry include/shibsp/attribute
-@dirrmtry include/shibsp
-@dirrmtry etc/shibboleth
+@dir share/doc/shibboleth/api
+@dir share/doc/shibboleth
+@dir lib/shibboleth
+@dir share/xml/shibboleth
+@dir include/shibsp/util
+@dir include/shibsp/security
+@dir include/shibsp/remoting
+@dir include/shibsp/metadata
+@dir include/shibsp/lite
+@dir include/shibsp/handler
+@dir include/shibsp/binding
+@dir include/shibsp/attribute/resolver
+@dir include/shibsp/attribute/filtering
+@dir include/shibsp/attribute
+@dir include/shibsp
+@dir etc/shibboleth
+@dir /var/log/shibboleth-www
 @exec install -d -o %%SHIBD_USER%% -g %%SHIBD_GROUP%% -m 755 /var/log/shibboleth
 @exec install -d -o %%SHIBD_USER%% -g %%SHIBD_GROUP%% -m 755 /var/cache/shibboleth
 @exec install -d -o %%SHIBD_USER%% -g %%WWWGRP%% -m 750 /var/run/shibboleth
 @owner %%SHIBD_USER%%
 @group %%SHIBD_GROUP%%
-@dirrmtry /var/log/shibboleth
-@dirrmtry /var/cache/shibboleth
+@dir /var/log/shibboleth
+@dir /var/cache/shibboleth
 @mode 750
 @group %%WWWGRP%%
-@dirrmtry /var/run/shibboleth
+@dir /var/run/shibboleth