diff --git a/dev-libs/softhsm/patches/softhsm-2.4.0.patchset b/dev-libs/softhsm/patches/softhsm-2.5.0.patchset
similarity index 100%
rename from dev-libs/softhsm/patches/softhsm-2.4.0.patchset
rename to dev-libs/softhsm/patches/softhsm-2.5.0.patchset
diff --git a/dev-libs/softhsm/softhsm2-2.4.0.recipe b/dev-libs/softhsm/softhsm2-2.5.0.recipe
similarity index 79%
rename from dev-libs/softhsm/softhsm2-2.4.0.recipe
rename to dev-libs/softhsm/softhsm2-2.5.0.recipe
index dbebb386e..069155561 100644
--- a/dev-libs/softhsm/softhsm2-2.4.0.recipe
+++ b/dev-libs/softhsm/softhsm2-2.5.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="26aac12bdeaacd15722dc0a24a5a1981a3b711e61d10ac687a23ff0b7075da07"
+CHECKSUM_SHA256="92aa56cf45e25892326e98b851c44de9cac8559e208720e579bf8e2cd1c132b2"
 SOURCE_DIR="softhsm-$portVersion"
 PATCHES="softhsm-$portVersion.patchset"
 
@@ -66,11 +66,11 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
-defineDebugInfoPackage softhsm${majorVersion}$secondaryArchSuffix \
-	$commandBinDir/softhsm${majorVersion}-dump-file \
-	$commandBinDir/softhsm${majorVersion}-keyconv \
-	$commandBinDir/softhsm${majorVersion}-util \
-	$libDir/softhsm/libsofthsm${majorVersion}.so
+defineDebugInfoPackage softhsm$majorVersion$secondaryArchSuffix \
+	"$commandBinDir"/softhsm$majorVersion-dump-file \
+	"$commandBinDir"/softhsm$majorVersion-keyconv \
+	"$commandBinDir"/softhsm$majorVersion-util \
+	"$libDir"/softhsm/libsofthsm$majorVersion.so
 
 PATCH()
 {
@@ -88,7 +88,7 @@ PATCH()
 
 BUILD()
 {
-	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
+	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir"
 	make $jobArgs
 }
 
@@ -98,13 +98,13 @@ INSTALL()
 
 	sed -i -e "/^directories\.tokendir/ \
 			s|$prefix/|`finddir B_SYSTEM_DIRECTORY`/|;" \
-		$settingsDir/softhsm${majorVersion}.conf \
-		$settingsDir/softhsm${majorVersion}.conf.sample
+		"$settingsDir"/softhsm$majorVersion.conf \
+		"$settingsDir"/softhsm$majorVersion.conf.sample
 
-	rm -f $libDir/softhsm/*.la
+	rm -f "$libDir"/softhsm/*.la
 
-	mkdir -p $dataDir/softhsm
-	mv $settingsDir/softhsm${majorVersion}.conf.sample $dataDir/softhsm
+	mkdir -p "$dataDir"/softhsm
+	mv "$settingsDir"/softhsm$majorVersion.conf.sample "$dataDir"/softhsm
 }
 
 TEST()