diff --git a/security/opensaml/Makefile b/security/opensaml/Makefile
index 0ac1d3923184..909b994e5453 100644
--- a/security/opensaml/Makefile
+++ b/security/opensaml/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/12/17 07:36:12 obache Exp $
-#
+# $NetBSD: Makefile,v 1.4 2011/02/23 09:11:09 adam Exp $
 
-DISTNAME=	opensaml-2.3
-PKGREVISION=	2
+DISTNAME=	opensaml-2.4.1
 CATEGORIES=	security
-MASTER_SITES=	http://shibboleth.internet2.edu/downloads/opensaml/cpp/2.3/
+MASTER_SITES=	http://shibboleth.internet2.edu/downloads/opensaml/cpp/${PKGVERSION_NOREV}/
 
 MAINTAINER=	pettai@NetBSD.org
 HOMEPAGE=	http://www.opensaml.org/
@@ -13,16 +11,16 @@ LICENSE=	apache-2.0
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=	yes
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-doxygen-doc
 
-USE_LIBTOOL=	yes
-USE_LANGUAGES=	c c++
-
+.include "../../devel/libidn/buildlink3.mk"
+.include "../../devel/log4shib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../devel/log4shib/buildlink3.mk"
-.include "../../textproc/xerces-c/buildlink3.mk"
 .include "../../security/xml-security-c/buildlink3.mk"
+.include "../../textproc/xerces-c/buildlink3.mk"
 .include "../../textproc/xmltooling/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/opensaml/PLIST b/security/opensaml/PLIST
index 4b5646c34381..8bfc7b177bb3 100644
--- a/security/opensaml/PLIST
+++ b/security/opensaml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/06/08 12:02:21 pettai Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/02/23 09:11:09 adam Exp $
 bin/samlsign
 include/saml/Assertion.h
 include/saml/RootObject.h
@@ -29,6 +29,7 @@ include/saml/saml2/binding/SAML2SOAPClient.h
 include/saml/saml2/core/Assertions.h
 include/saml/saml2/core/Protocols.h
 include/saml/saml2/metadata/AbstractMetadataProvider.h
+include/saml/saml2/metadata/DiscoverableMetadataProvider.h
 include/saml/saml2/metadata/DynamicMetadataProvider.h
 include/saml/saml2/metadata/EndpointManager.h
 include/saml/saml2/metadata/Metadata.h
@@ -48,8 +49,9 @@ include/saml/util/SAMLConstants.h
 include/saml/version.h
 lib/libsaml.a
 lib/libsaml.so
-lib/libsaml.so.6
-lib/libsaml.so.6.0.0
+lib/libsaml.so.7
+lib/libsaml.so.7.0.0
+lib/pkgconfig/opensaml.pc
 share/doc/opensaml-${PKGVERSION}/LICENSE.txt
 share/doc/opensaml-${PKGVERSION}/LOG4CPP.LICENSE
 share/doc/opensaml-${PKGVERSION}/NOTICE.txt
@@ -95,9 +97,13 @@ share/xml/opensaml/saml10-catalog.xml
 share/xml/opensaml/saml11-catalog.xml
 share/xml/opensaml/saml20-catalog.xml
 share/xml/opensaml/sstc-metadata-attr.xsd
+share/xml/opensaml/sstc-request-initiation.xsd
 share/xml/opensaml/sstc-saml-attribute-ext.xsd
 share/xml/opensaml/sstc-saml-delegation.xsd
+share/xml/opensaml/sstc-saml-idp-discovery.xsd
+share/xml/opensaml/sstc-saml-metadata-algsupport-v1.0.xsd
 share/xml/opensaml/sstc-saml-metadata-ext-query.xsd
+share/xml/opensaml/sstc-saml-metadata-ui-v1.0.xsd
 share/xml/opensaml/sstc-saml-protocol-ext-thirdparty.xsd
 share/xml/opensaml/sstc-saml1x-metadata.xsd
 @pkgdir share/doc/opensaml-${PKGVERSION}/api
diff --git a/security/opensaml/buildlink3.mk b/security/opensaml/buildlink3.mk
index 41c2d2bd7373..2bc04fa31596 100644
--- a/security/opensaml/buildlink3.mk
+++ b/security/opensaml/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/03/15 19:40:44 pettai Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2011/02/23 09:11:09 adam Exp $
 
 BUILDLINK_TREE+=	opensaml
 
@@ -7,8 +6,8 @@ BUILDLINK_TREE+=	opensaml
 OPENSAML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.opensaml+=	opensaml>=2.3
-BUILDLINK_ABI_DEPENDS.opensaml?=	opensaml>=2.3
-BUILDLINK_PKGSRCDIR.opensaml?=	../../security/opensaml
+BUILDLINK_ABI_DEPENDS.opensaml+=	opensaml>=2.3
+BUILDLINK_PKGSRCDIR.opensaml?=		../../security/opensaml
 
 .include "../../security/openssl/buildlink3.mk"
 .endif	# OPENSAML_BUILDLINK3_MK
diff --git a/security/opensaml/distinfo b/security/opensaml/distinfo
index fba7f8de54e7..0fbf012f6093 100644
--- a/security/opensaml/distinfo
+++ b/security/opensaml/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/03/15 19:40:44 pettai Exp $
+$NetBSD: distinfo,v 1.2 2011/02/23 09:11:09 adam Exp $
 
-SHA1 (opensaml-2.3.tar.gz) = d5b29a25a26a85957379279280b0f530146ec185
-RMD160 (opensaml-2.3.tar.gz) = 63d8aeb566dbc18f9941247cd7bbf823aa796204
-Size (opensaml-2.3.tar.gz) = 926057 bytes
+SHA1 (opensaml-2.4.1.tar.gz) = 953ca40f8216ce33fcd10abdebc5dbf2ded54705
+RMD160 (opensaml-2.4.1.tar.gz) = 64258e01354ca8aac732355583f0f85de38990bc
+Size (opensaml-2.4.1.tar.gz) = 870509 bytes