diff --git a/postgresql13.changes b/postgresql13.changes
index 27b0f05..07df436 100644
--- a/postgresql13.changes
+++ b/postgresql13.changes
@@ -10,6 +10,8 @@ Tue Aug 24 12:45:53 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
     operations, but there may be other instances. The result would
     be crashes or incorrect query results. Disclosure of server
     memory contents is also possible.
+  * bsc#1185952: Adjust JIT code to prepare for forthcoming LLVM
+    API change
 
 -------------------------------------------------------------------
 Mon Jun 28 10:00:46 UTC 2021 - Reinhard Max <max@suse.com>
diff --git a/postgresql13.spec b/postgresql13.spec
index d0f194d..8b704d0 100644
--- a/postgresql13.spec
+++ b/postgresql13.spec
@@ -116,15 +116,10 @@ BuildRequires:  libicu-devel
 BuildRequires:  libselinux-devel
 %endif
 %if %{with llvm}
-BuildRequires:  gcc-c++
-%ifarch s390x
-BuildRequires:  clang11
-BuildRequires:  llvm11-devel
-%else
 BuildRequires:  clang
+BuildRequires:  gcc-c++
 BuildRequires:  llvm-devel
 %endif
-%endif
 BuildRequires:  libxslt-devel
 BuildRequires:  openldap2-devel
 BuildRequires:  openssl-devel