diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 9fe21d517..14c6834c5 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -13,18 +13,25 @@ checkdepends=('cppunit')
 backup=("etc/softhsm2.conf")
 options=(!libtool !lto debug)
 source=("https://dist.opendnssec.org/source/$pkgname-$pkgver.tar.gz"{,.sig}
+        "https://src.fedoraproject.org/rpms/softhsm/raw/rawhide/f/softhsm-openssl3-tests.patch"
         "softhsm-2.6.1-rh1831086-exit.patch")
 sha256sums=('61249473054bcd1811519ef9a989a880a7bdcc36d317c9c25457fc614df475f2'
             'SKIP'
+            'd97f51e8d41e8bf0ef2ee3959be746d0349e8e1c0130ddaf3d905c23f8e43230'
             '163338a73ab1bcc475e07b96f054d3c8f67ac9d2637b8f74ddaa97aa6b4171e1')
 validpgpkeys=('4D0388CE86BB398B387B663041F623BE4FCB0B94')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 -i "$srcdir/softhsm-openssl3-tests.patch"
   patch -p1 -i "$srcdir/softhsm-2.6.1-rh1831086-exit.patch"
   sed -i 's:^full_libdir=":#full_libdir=":g' configure.ac
   sed -i "s:libdir)/@PACKAGE@:libdir):" Makefile.in
   autoreconf -vfi
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure \
     --prefix=/usr \
     --libdir=/usr/lib/pkcs11 \