diff --git a/dev-libs/softhsm/patches/softhsm-2.3.0.patchset b/dev-libs/softhsm/patches/softhsm-2.4.0.patchset
similarity index 100%
rename from dev-libs/softhsm/patches/softhsm-2.3.0.patchset
rename to dev-libs/softhsm/patches/softhsm-2.4.0.patchset
diff --git a/dev-libs/softhsm/softhsm2-2.3.0.recipe b/dev-libs/softhsm/softhsm2-2.4.0.recipe
similarity index 80%
rename from dev-libs/softhsm/softhsm2-2.3.0.recipe
rename to dev-libs/softhsm/softhsm2-2.4.0.recipe
index 07a16daee..dbebb386e 100644
--- a/dev-libs/softhsm/softhsm2-2.3.0.recipe
+++ b/dev-libs/softhsm/softhsm2-2.4.0.recipe
@@ -9,7 +9,7 @@ COPYRIGHT="2010 .SE, The Internet Infrastructure Foundation
 LICENSE="BSD (2-clause)"
 REVISION="1"
 SOURCE_URI="https://dist.opendnssec.org/source/softhsm-$portVersion.tar.gz"
-CHECKSUM_SHA256="5ed604c89a3a6ef9d7d1ee92c28a2c4b3cd1f86f302c808e2d12c8f39aa2c127"
+CHECKSUM_SHA256="26aac12bdeaacd15722dc0a24a5a1981a3b711e61d10ac687a23ff0b7075da07"
 SOURCE_DIR="softhsm-$portVersion"
 PATCHES="softhsm-$portVersion.patchset"
 
@@ -26,6 +26,14 @@ fi
 
 majorVersion="${portVersion%%.*}"
 
+GLOBAL_WRITABLE_FILES="
+	settings/softhsm$majorVersion.conf keep-old
+	var/lib/softhsm directory keep-old
+	"
+USER_SETTINGS_FILES="
+	settings/softhsm$majorVersion.conf template data/softhsm/softhsm$majorVersion.conf.sample
+	"
+
 PROVIDES="
 	softhsm$majorVersion$secondaryArchSuffix = $portVersion
 	cmd:softhsm${majorVersion}_dump_file$commandSuffix = $portVersion
@@ -43,6 +51,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libbotan_2$secondaryArchSuffix
+	devel:libcppunit$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -57,21 +66,26 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
-USER_SETTINGS_FILES="
-	settings/softhsm${majorVersion}.conf template data/softhsm/softhsm${majorVersion}.conf.sample
-	"
-
-GLOBAL_WRITABLE_FILES="
-	settings/softhsm${majorVersion}.conf keep-old
-	var/lib/softhsm directory keep-old
-	"
-
 defineDebugInfoPackage softhsm${majorVersion}$secondaryArchSuffix \
 	$commandBinDir/softhsm${majorVersion}-dump-file \
 	$commandBinDir/softhsm${majorVersion}-keyconv \
 	$commandBinDir/softhsm${majorVersion}-util \
 	$libDir/softhsm/libsofthsm${majorVersion}.so
 
+PATCH()
+{
+	sed -i \
+		-e "/^objstoretest_LDFLAGS/ s/ -pthread//;" \
+		-e "/^sessionmgrtest_LDFLAGS/ s/ -pthread//;" \
+		-e "/^slotmgrtest_LDFLAGS/ s/ -pthread//;" \
+		-e "/^p11test_LDFLAGS/ s/ -pthread//;" \
+		src/lib/object_store/test/Makefile.* \
+		src/lib/session_mgr/test/Makefile.* \
+		src/lib/slot_mgr/test/Makefile.* \
+		src/lib/test/Makefile.* \
+
+}
+
 BUILD()
 {
 	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir