diff --git a/postgresql12.changes b/postgresql12.changes
index cd9b92a..89ec4b9 100644
--- a/postgresql12.changes
+++ b/postgresql12.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 19 15:24:24 UTC 2021 - Reinhard Max <max@suse.com>
+
+- bsc#1185952: llvm12 breaks PostgreSQL 11 and 12 on s390x.
+  Use llvm11 as a workaround.
+
 -------------------------------------------------------------------
 Tue May 11 16:19:19 UTC 2021 - Reinhard Max <max@suse.com>
 
diff --git a/postgresql12.spec b/postgresql12.spec
index 03ce05b..f15af1c 100644
--- a/postgresql12.spec
+++ b/postgresql12.spec
@@ -91,7 +91,6 @@ BuildRequires:  %libpq
 %if 0%{?suse_version} >= 1500 && %pgsuffix >= 11 && %pgsuffix < 90
 %bcond_without  llvm
 %else
-# LLVM is currently unsupported on SLE, so don't use it
 %bcond_with     llvm
 %endif
 %endif
@@ -116,10 +115,15 @@ BuildRequires:  libicu-devel
 BuildRequires:  libselinux-devel
 %endif
 %if %{with llvm}
-BuildRequires:  clang
 BuildRequires:  gcc-c++
+%ifarch s390x
+BuildRequires:  clang11
+BuildRequires:  llvm11-devel
+%else
+BuildRequires:  clang
 BuildRequires:  llvm-devel
 %endif
+%endif
 BuildRequires:  libxslt-devel
 BuildRequires:  openldap2-devel
 BuildRequires:  openssl-devel