diff --git a/.gitignore b/.gitignore
index 6e33a70..43887b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@
 /softhsm-2.2.0.tar.gz
 /softhsm-2.3.0.tar.gz
 /softhsm-2.3.0.tar.gz.sig
+/softhsm-2.4.0.tar.gz
+/softhsm-2.4.0.tar.gz.sig
diff --git a/softhsm.spec b/softhsm.spec
index ac34811..3e82411 100644
--- a/softhsm.spec
+++ b/softhsm.spec
@@ -2,14 +2,13 @@
 
 Summary: Software version of a PKCS#11 Hardware Security Module
 Name: softhsm
-Version: 2.3.0
-Release: %{?prever:0.}4%{?prever:.%{prever}}%{?dist}
+Version: 2.4.0
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
 License: BSD
 Url: http://www.opendnssec.org/
 Source: http://dist.opendnssec.org/source/%{?prever:testing/}%{name}-%{version}.tar.gz
 Source1: http://dist.opendnssec.org/source/%{?prever:testing/}%{name}-%{version}.tar.gz.sig
 
-Patch0: softhsm-2.3.0-rsa-pss.patch
 Patch1: softhsm-2.3.0-reset-mutex-callbacks.patch
 
 Group: Applications/System
@@ -44,7 +43,6 @@ The devel package contains the libsofthsm include files
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
 
-%patch0 -p1
 %patch1 -p1
 
 %if 0%{?prever:1}
@@ -118,6 +116,9 @@ if [ -f /var/softhsm/slot0.db ]; then
 fi
 
 %changelog
+* Sat Aug 11 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 2.4.0-1
+- Updated to latest upstream release
+
 * Tue Jul 31 2018 Alexander Bokovoy <abokovoy@redhat.com> - 2.3.0-4
 - Fix crash when used via p11-kit (#1607635)
 
diff --git a/sources b/sources
index 92e69a4..961cf21 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (softhsm-2.3.0.tar.gz) = ef9ee41aa6eaeeb004d4ff5c78ca6e00895cc47e36551025a4422806eee8eead985cfd28476a867761a810f6957b0759edaac769bcdedf4ad974e426cfefce0f
-SHA512 (softhsm-2.3.0.tar.gz.sig) = 40df888f981b1ec5bb9e83bf087de29948268d8b5a2d9ef95781d07ba409d59d10c7ba709e3476c72ed1b03d7863e15af787e8ec350d47ece5d7719a379926a6
+SHA512 (softhsm-2.4.0.tar.gz) = f14f65de32206500f708523ee88d8d5e3d1fd40175f1a9cd24c7760c829e2de9dbcb05453022df8186836c49a57e4eae7f2e75ce6a5346a426114f4d610a8a84
+SHA512 (softhsm-2.4.0.tar.gz.sig) = a8f616e2a5ab7fdb09c0d2a850bda833be889aea0aa1e5e2bcb0012351dcf3c870e496918ba16bb0bb942bb13350ff1030b25feab29914d07897b39c30526624