diff --git a/0001-Fix-brittleness-in-Feature-VarArgByVal-test.patch b/0001-Fix-brittleness-in-Feature-VarArgByVal-test.patch
deleted file mode 100644
index fa7da09..0000000
--- a/0001-Fix-brittleness-in-Feature-VarArgByVal-test.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Daniel Schemmel <daniel@schemmel.net>
-Date: Fri, 9 Feb 2024 22:34:03 +0000
-Subject: Fix brittleness in Feature/VarArgByVal test
-Git-repo: https://github.com/danielschemmel/klee.git#varargbyval-fix
-Git-commit: 022c8102b7be781f809d589ed37d5f755bead81b
-Patch-mainline: PR#1692
-References: llvm 15 fix
-
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
----
- test/Feature/VarArgByVal.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/Feature/VarArgByVal.c b/test/Feature/VarArgByVal.c
-index 7b979f61..3f60ea12 100644
---- a/test/Feature/VarArgByVal.c
-+++ b/test/Feature/VarArgByVal.c
-@@ -9,7 +9,7 @@
- //
- // TODO: Make noundef unconditional when LLVM 14 is the oldest supported version.
- // CHECK: call void (ptr, i32, ...) @test1(ptr sret(%struct.foo) align 8 {{.*}}, i32 noundef -1, ptr noundef byval(%struct.foo) align 8 {{.*}}, ptr noundef byval(%struct.bar) align 8 {{.*}})
--// CHECK: call void (ptr, i32, i64, ...) @test2(ptr sret(%struct.foo) align 8 %tmp, i32 noundef {{.*}}, i64 noundef {{.*}}, i32 noundef {{.*}}, ptr noundef byval(%struct.foo) align 8 {{.*}}, i64 noundef {{.*}}, ptr noundef byval(%struct.bar) align 8 {{.*}}, ptr noundef byval(%struct.foo) align 8 {{.*}}, ptr noundef byval(%struct.bar) align 8 {{.*}})
-+// CHECK: call void (ptr, i32, i64, ...) @test2(ptr sret(%struct.foo) align 8 {{.*}}, i32 noundef {{.*}}, i64 noundef {{.*}}, i32 noundef {{.*}}, ptr noundef byval(%struct.foo) align 8 {{.*}}, i64 noundef {{.*}}, ptr noundef byval(%struct.bar) align 8 {{.*}}, ptr noundef byval(%struct.foo) align 8 {{.*}}, ptr noundef byval(%struct.bar) align 8 {{.*}})
- #include <stdarg.h>
- #include <assert.h>
- #include <stdio.h>
--- 
-2.43.0
-
diff --git a/_servicedata b/_servicedata
index b2ef906..3f1381b 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/klee/klee</param>
-              <param name="changesrevision">9336cd28f6e58c2f9bc01ec3dbf3930688ad0287</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">cc7f3ff55170c476aa01cf1973ee16e5c31cb0d0</param></service></servicedata>
\ No newline at end of file
diff --git a/klee-3.0+20240208.obscpio b/klee-3.0+20240208.obscpio
deleted file mode 100644
index bc4259f..0000000
--- a/klee-3.0+20240208.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:369037b90832d02a041cde740d55d02fa779a8c007d48f3c9667eb419242e142
-size 19196429
diff --git a/klee-3.1+20240418.obscpio b/klee-3.1+20240418.obscpio
new file mode 100644
index 0000000..2c41532
--- /dev/null
+++ b/klee-3.1+20240418.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a7472c0b06612ac47ebe264ab09134bf64b809c243d07bd7527b3bf0f04d663b
+size 19193357
diff --git a/klee.changes b/klee.changes
index 354cc23..d3848e5 100644
--- a/klee.changes
+++ b/klee.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Thu Apr 25 06:08:03 UTC 2024 - jslaby@suse.cz
+
+- Update to version 3.1+20240418:
+  * Renamed test/Expr to test/kleaver and move ReadExprConsistency.c to
+    test/Feature
+  * Workaround for MSan failures due to
+    https://github.com/llvm/llvm-project/issues/78354
+  * Addressed missing override warnings emitted by recent compilers
+  * add pythonpath to lit forwarded env vars
+  * TARGET_TRIPLE was renamed to LLVM_TARGET_TRIPLE since LLVM 15
+  * New domain name klee-se.org, updating links.
+  * Final changes to release notes for v3.1
+  * Add support to fully concretise objects if modified externally
+  * Support external call concretisation policies for referenced objects
+  * Refactor `ObjectState::flushToConcreteStore` to use `toConstant`
+  * Use correctly constrained constants if the memory object is fully symbolic
+  * Correctly update symbolic variables that have been changed externally
+  * and much more.
+- Remove
+  * 0001-Fix-brittleness-in-Feature-VarArgByVal-test.patch (in upstream)
+
 -------------------------------------------------------------------
 Fri Feb 09 07:40:49 UTC 2024 - jslaby@suse.cz
 
diff --git a/klee.obsinfo b/klee.obsinfo
index a245b5e..23b65c2 100644
--- a/klee.obsinfo
+++ b/klee.obsinfo
@@ -1,4 +1,4 @@
 name: klee
-version: 3.0+20240208
-mtime: 1707398239
-commit: 9336cd28f6e58c2f9bc01ec3dbf3930688ad0287
+version: 3.1+20240418
+mtime: 1713427003
+commit: cc7f3ff55170c476aa01cf1973ee16e5c31cb0d0
diff --git a/klee.spec b/klee.spec
index ac6b14b..ec1a851 100644
--- a/klee.spec
+++ b/klee.spec
@@ -30,14 +30,13 @@ Name:           klee
 Summary:        LLVM Execution Engine
 License:        NCSA
 Group:          Development/Languages/Other
-Version:        3.0+20240208
+Version:        3.1+20240418
 Release:        0
 URL:            http://klee.github.io/
 Source0:        %{name}-%{version}.tar.xz
 Source1:        %{name}-rpmlintrc
 Source2:        https://raw.githubusercontent.com/llvm/llvm-project/llvmorg-%{llvm_version}.0.0/llvm/utils/not/not.cpp
 Source3:        https://raw.githubusercontent.com/llvm/llvm-project/llvmorg-%{llvm_version}.0.0/llvm/utils/FileCheck/FileCheck.cpp
-Patch0:         0001-Fix-brittleness-in-Feature-VarArgByVal-test.patch
 
 BuildRequires:  clang%{llvm_version}
 BuildRequires:  cmake