diff --git a/security/softhsm2/Makefile b/security/softhsm2/Makefile
index e1209054b8ec..18603bbb9ecf 100644
--- a/security/softhsm2/Makefile
+++ b/security/softhsm2/Makefile
@@ -1,53 +1,48 @@
 PORTNAME=	softhsm
-PORTVERSION=	2.6.1
-PORTREVISION=	4
+DISTVERSION=	2.7.0
 CATEGORIES=	security
-MASTER_SITES=	http://dist.opendnssec.org/source/ \
-		http://dist.opendnssec.org/source/testing/
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Software implementation of a Hardware Security Module (HSM)
-WWW=		https://www.opendnssec.org/
+WWW=		https://www.softhsm.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-MY_DEPENDS+=		p11-kit:security/p11-kit
-BUILD_DEPENDS+=		${MY_DEPENDS}
-RUN_DEPENDS+=		${MY_DEPENDS}
+MY_DEPENDS=	p11-kit:security/p11-kit
+BUILD_DEPENDS=	${MY_DEPENDS}
+RUN_DEPENDS=	${MY_DEPENDS}
 
-USES=		compiler:c++11-lang libtool pkgconfig ssl
+USES=		autoreconf compiler:c++11-lang libtool pkgconfig ssl
+USE_GITHUB=	yes
+GH_PROJECT=	SoftHSMv2
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-
-CONFIGURE_ARGS+=	--with-crypto-backend=openssl \
-			--with-openssl=${OPENSSLBASE} \
-			--disable-gost
+CONFIGURE_ARGS=	--disable-gost \
+		--with-crypto-backend=openssl \
+		--with-openssl=${OPENSSLBASE}
 
 INSTALL_TARGET=	install-strip
 
-CONFLICTS=	softhsm-1.*
-
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		SQLITE MIGRATE
-OPTIONS_DEFAULT=	CRYP_OPEN SQLITE MIGRATE
+OPTIONS_DEFAULT=	SQLITE MIGRATE
 
 OPTIONS_SUB=		yes
 MIGRATE_DESC=		Build the migration tool
 SQLITE_DESC=		Build with object store backend DB support (SQLITE3)
 
 MIGRATE_IMPLIES=	SQLITE
 MIGRATE_CONFIGURE_WITH=	migrate
 
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_WITH=	sqlite3=${LOCALBASE} objectstore-backend-db
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/p11-kit/modules
 	${INSTALL_DATA} ${WRKSRC}/softhsm2.module \
 		${STAGEDIR}${PREFIX}/share/p11-kit/modules
 
 .include <bsd.port.mk>
diff --git a/security/softhsm2/distinfo b/security/softhsm2/distinfo
index 8926b2a552b8..206b82cd60e0 100644
--- a/security/softhsm2/distinfo
+++ b/security/softhsm2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588231625
-SHA256 (softhsm-2.6.1.tar.gz) = 61249473054bcd1811519ef9a989a880a7bdcc36d317c9c25457fc614df475f2
-SIZE (softhsm-2.6.1.tar.gz) = 1066766
+TIMESTAMP = 1768921725
+SHA256 (softhsm-SoftHSMv2-2.7.0_GH0.tar.gz) = be14a5820ec457eac5154462ffae51ba5d8a643f6760514d4b4b83a77be91573
+SIZE (softhsm-SoftHSMv2-2.7.0_GH0.tar.gz) = 564143
diff --git a/security/softhsm2/pkg-plist b/security/softhsm2/pkg-plist
index 7eff707eb2b8..3ca8940b9cfe 100644
--- a/security/softhsm2/pkg-plist
+++ b/security/softhsm2/pkg-plist
@@ -1,20 +1,20 @@
 bin/softhsm2-dump-file
 %%SQLITE%%bin/softhsm2-dump-db
 bin/softhsm2-keyconv
 %%MIGRATE%%bin/softhsm2-migrate
 bin/softhsm2-util
 @sample %%ETCDIR%%2.conf.sample
 lib/softhsm/libsofthsm2.a
 lib/softhsm/libsofthsm2.so
 share/man/man1/softhsm2-dump-file.1.gz
 %%SQLITE%%share/man/man1/softhsm2-dump-db.1.gz
 share/man/man1/softhsm2-keyconv.1.gz
 %%MIGRATE%%share/man/man1/softhsm2-migrate.1.gz
 share/man/man1/softhsm2-util.1.gz
 share/man/man5/softhsm2.conf.5.gz
+share/p11-kit/modules/softhsm2.module
+@dir share/p11-kit/modules
+@dir share/p11-kit
 @dir /var/lib/softhsm/tokens
 @dir /var/lib/softhsm
 @dir /var/lib
-@dir share/p11-kit/modules
-@dir share
-share/p11-kit/modules/softhsm2.module