diff --git a/srcpkgs/llvm18/patches/z3-libs.patch b/srcpkgs/llvm18/patches/z3-libs.patch
new file mode 100644
index 00000000000..89e4390a495
--- /dev/null
+++ b/srcpkgs/llvm18/patches/z3-libs.patch
@@ -0,0 +1,21 @@
+--- a/llvm/CMakeLists.txt
++++ b/llvm/CMakeLists.txt
+@@ -563,6 +563,7 @@ if (LLVM_ENABLE_Z3_SOLVER)
+   if (NOT Z3_FOUND)
+     message(FATAL_ERROR "LLVM_ENABLE_Z3_SOLVER cannot be enabled when Z3 is not available.")
+   endif()
++  set(Z3_LIBRARIES z3)
+ 
+   set(LLVM_WITH_Z3 1)
+ endif()
+--- a/llvm/lib/Support/CMakeLists.txt
++++ b/llvm/lib/Support/CMakeLists.txt
+@@ -88,7 +88,7 @@ endif()
+ 
+ # Link Z3 if the user wants to build it.
+ if(LLVM_WITH_Z3)
+-  set(system_libs ${system_libs} ${Z3_LIBRARIES})
++  set(system_libs ${system_libs} z3)
+ endif()
+ 
+ # Override the C runtime allocator on Windows and embed it into LLVM tools & libraries
diff --git a/srcpkgs/llvm18/template b/srcpkgs/llvm18/template
index 86eb524677a..7d247ddcbba 100644
--- a/srcpkgs/llvm18/template
+++ b/srcpkgs/llvm18/template
@@ -1,7 +1,7 @@
 # Template file for 'llvm18'.
 pkgname=llvm18
 version=18.1.8
-revision=4
+revision=5
 build_wrksrc=llvm
 build_style=cmake
 configure_args="
@@ -311,8 +311,6 @@ post_install() {
 		vcopy ${wrksrc}/${build_wrksrc}/runtimes-doc/libunwind/docs/html ${LIBUNWIND_DOCS}
 	fi
 
-	sed -i 's|/usr[^;]*libz3.so|z3|' "${DESTDIR}/usr/lib/cmake/llvm/LLVMExports.cmake"
-
 	# Can this be disabled some other way?
 	rm -rf ${DESTDIR}/usr/lib64
 }