diff --git a/baselibs.conf b/baselibs.conf
deleted file mode 100644
index 0dfe8ae..0000000
--- a/baselibs.conf
+++ /dev/null
@@ -1 +0,0 @@
-openssl-ibmca
diff --git a/openssl-ibmca-2.2.1.tar.gz b/openssl-ibmca-2.2.1.tar.gz
deleted file mode 100644
index 54f6b14..0000000
--- a/openssl-ibmca-2.2.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1dd77f6f749f07721f993ddecc27b68b1c1fd8c09f524fae6529e86298ed7f01
-size 98187
diff --git a/openssl-ibmca-2.3.1.tar.gz b/openssl-ibmca-2.3.1.tar.gz
new file mode 100644
index 0000000..31f35e8
--- /dev/null
+++ b/openssl-ibmca-2.3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:27946ac43c8714c7c2db40482bc2e7b3386eb534b322ebc2586b9fc8072f3ef2
+size 189509
diff --git a/openssl-ibmca.changes b/openssl-ibmca.changes
index 8dbf9c8..6fb93b5 100644
--- a/openssl-ibmca.changes
+++ b/openssl-ibmca.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Oct  4 19:33:57 UTC 2022 - Mark Post <mpost@suse.com>
+
+- Upgraded to version 2.3.1 (jsc#PED-597)
+  * openssl-ibmca 2.3.1
+    - Adjustments for libica 4.1.0
+  * openssl-ibmca 2.3.0
+    - First version including the provider
+    - Fix for engine build without OpenSSL 3.0 sources
+  * openssl-ibmca 2.2.3
+    - Fix PKEY segfault with OpenSSL 3.0
+  * openssl-ibmca 2.2.2
+    - Fix tests with OpenSSL 3.0
+    - Build against libica 4.0
+- Removed a Requires for libica from the specfile.
+- Removed the obsolete baselibs.conf file
+
 -------------------------------------------------------------------
 Tue Mar 15 22:00:05 UTC 2022 - Mark Post <mpost@suse.com>
 
diff --git a/openssl-ibmca.spec b/openssl-ibmca.spec
index abe5ff8..2e9dd22 100644
--- a/openssl-ibmca.spec
+++ b/openssl-ibmca.spec
@@ -19,15 +19,14 @@
 %global enginesdir %(pkg-config --variable=enginesdir libcrypto)
 
 Name:           openssl-ibmca
-Version:        2.2.1
+Version:        2.3.1
 Release:        0
 Summary:        The IBMCA OpenSSL dynamic engine
 License:        Apache-2.0
 Group:          Hardware/Other
 URL:            https://github.com/opencryptoki/openssl-ibmca
 Source:         https://github.com/opencryptoki/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Source1:        baselibs.conf
-Source2:        engine_section.txt
+Source1:        engine_section.txt
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -35,7 +34,6 @@ BuildRequires:  libica-devel >= 3.1.1
 BuildRequires:  libica-tools >= 2.4.0
 BuildRequires:  libtool
 BuildRequires:  openssl-devel
-Requires:       libica3
 Requires:       openssl
 ExclusiveArch:  s390x
 
@@ -57,7 +55,7 @@ export CPPFLAGS="%{optflags}"
 %install
 # Update the sample config file so that the dynamic path points
 # to the correct version of the engines directory.
-sed -i -e "/^dynamic_path/s, = .*/, = %{enginesdir}/," src/openssl.cnf.sample
+sed -i -e "/^dynamic_path/s, = .*/, = %{enginesdir}/," src/engine/openssl.cnf.sample
 
 %make_install
 rm %{buildroot}/%{enginesdir}/ibmca.la
@@ -67,12 +65,12 @@ rm %{buildroot}/%{enginesdir}/ibmca.la
 # is run. It will be read by the openssl .include directive that points
 # to /etc/ssl/engines.d/
 mkdir -p %{buildroot}%{_datadir}/%{name}
-cp -p %{SOURCE2} %{buildroot}%{_datadir}/%{name}/openssl-ibmca.sectiondef.txt
+cp -p %{SOURCE1} %{buildroot}%{_datadir}/%{name}/openssl-ibmca.sectiondef.txt
 
 # This will create the actual engine definition section that will be usable
 # by the .include directive of openSSL. That include will be inserted during
 # the postinstall phase of the package installation.
-grep -v "^#" src/openssl.cnf.sample | \
+grep -v "^#" src/engine/openssl.cnf.sample | \
     sed -n -e '/^\[ibmca_section\]/,$ p' | \
     sed -e '/^$/ {N;N;s/\n\n/\n/g;}' | \
     sed -e 's/^dynamic_path/#dynamic_path/' > %{buildroot}%{_datadir}/%{name}/openssl-ibmca.enginedef.cnf
@@ -96,13 +94,11 @@ fi
 
 %files
 %license LICENSE
+%doc ChangeLog
 %doc README.md
-%doc src/openssl.cnf.sample
-%doc src/openssl.cnf.defaultlibica
-%doc src/openssl.cnf.libica
-%doc src/openssl.cnf.libica-cex
+%doc src/engine/openssl.cnf.sample
+%doc src/engine/ibmca-engine-opensslconfig
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/openssl.cnf.*
 %{_datadir}/%{name}/openssl-ibmca.sectiondef.txt
 %{_datadir}/%{name}/openssl-ibmca.enginedef.cnf
 %{enginesdir}/ibmca.*