diff --git a/baselibs.conf b/baselibs.conf
new file mode 100644
index 0000000..918743f
--- /dev/null
+++ b/baselibs.conf
@@ -0,0 +1 @@
+libp11-3
diff --git a/libp11-openssl-3.1.patch b/libp11-openssl-3.1.patch
new file mode 100644
index 0000000..ffea110
--- /dev/null
+++ b/libp11-openssl-3.1.patch
@@ -0,0 +1,13 @@
+Index: libp11-0.4.12/configure.ac
+===================================================================
+--- libp11-0.4.12.orig/configure.ac
++++ libp11-0.4.12/configure.ac
+@@ -33,7 +33,7 @@ AC_C_BIGENDIAN
+ # issues with applications linking to new openssl, old libp11, and vice versa
+ case "`$PKG_CONFIG --modversion --silence-errors libcrypto || \
+ 	$PKG_CONFIG --modversion openssl`" in
+-	3.0.*) # Predicted engines directory prefix for OpenSSL 3.x
++	3.1.*|3.0.*) # Predicted engines directory prefix for OpenSSL 3.x
+ 	    LIBP11_LT_OLDEST="3"
+ 	    debian_ssl_prefix="openssl-3.0.0";;
+ 	1.1.*) # Predicted engines directory prefix for OpenSSL 1.1.x
diff --git a/libp11.changes b/libp11.changes
index eba6e2e..4332f00 100644
--- a/libp11.changes
+++ b/libp11.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jun  6 12:24:11 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add support for openSSL 3.1:
+  + Add libp11-openssl-3.1.patch: handle openSSL 3.1 the same as 3.0
+  + Add libtool BuildRequires and call autoreconf: abobe patch
+    touches the build system.
+  + Add baselibs.conf
+
 -------------------------------------------------------------------
 Mon Feb  6 10:41:29 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/libp11.spec b/libp11.spec
index f1e29c3..0bf7dce 100644
--- a/libp11.spec
+++ b/libp11.spec
@@ -35,7 +35,10 @@ Source0:        https://github.com/OpenSC/libp11/releases/download/%{name}-%{ver
 Source1:        https://github.com/OpenSC/libp11/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz.asc
 Source2:        %{name}.keyring
 Source3:        %{name}-rpmlintrc
+Source4:        baselibs.conf
+Patch0:         libp11-openssl-3.1.patch
 BuildRequires:  fdupes
+BuildRequires:  libtool
 BuildRequires:  p11-kit-devel
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(openssl)
@@ -103,11 +106,12 @@ thus is "derived from the RSA Security Inc. PKCS #11 Cryptographic
 Token Interface (Cryptoki)".
 
 %prep
-%setup -q
+%autosetup -p1
 # Since the library name changes based on used openssl, we have to create baselibs.conf dynamically
 echo %{libname} > %{_sourcedir}/baselibs.conf
 
 %build
+autoreconf -fiv
 %configure \
   --disable-static \
   --disable-silent-rules \