diff --git a/postgresql-extensions-macros b/postgresql-extensions-macros
index b38332b..847e501 100644
--- a/postgresql-extensions-macros
+++ b/postgresql-extensions-macros
@@ -49,5 +49,5 @@ Recommends:     %{pg_name}-llvmjit   \
 %nil
 
 %pg_version_from_name %define pg_version %( echo %{?pg_name} | sed -e 's|^postgresql||g' )%{nil}
-%postgresql_has_llvm (0%{?suse_version} >= 1500 && 0%{?pg_version} >= 11 && 0%{?pg_version} < 90)
+%postgresql_has_llvm (0%{?suse_version} >= 1500 && "%{_target_cpu}" != "riscv64" && 0%{?pg_version} >= 11 && 0%{?pg_version} < 90)
 
diff --git a/postgresql.changes b/postgresql.changes
index c7d4323..01165f9 100644
--- a/postgresql.changes
+++ b/postgresql.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Jan  9 09:22:55 UTC 2023 - Reinhard Max <max@suse.com>
+
+- bsc#1206796: Refine the distinction of where to use sysusers and
+  use bcond to have the expression only in one place.
+
+-------------------------------------------------------------------
+Thu Sep 22 14:23:49 UTC 2022 - Andreas Schwab <schwab@suse.de>
+
+- riscv64 does not have llvm support yet,
+  adapt the %postgresql_has_llvm macro accordingly. 
+
 -------------------------------------------------------------------
 Mon Sep  5 13:12:41 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/postgresql.spec b/postgresql.spec
index b8604f9..00fd24b 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -40,6 +40,14 @@
 %bcond_with     llvm
 %endif
 
+# On SLE-15 up to SP3 sysusers does not support shells
+# other than /bin/nologin
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400
+%bcond_without sysusers
+%else
+%bcond_with sysusers
+%endif
+
 Name:           postgresql
 Summary:        Basic Clients and Utilities for PostgreSQL
 License:        PostgreSQL
@@ -105,7 +113,7 @@ Requires:       postgresql-server-implementation
 Requires:       postgresql = %version-%release
 Recommends:     %defaultpackage-server
 %if 0%{?suse_version} >= 1315
-%if 0%{?suse_version} >= 1500
+%if %{with sysusers}
 BuildRequires:  sysuser-tools
 %sysusers_requires
 %else
@@ -314,7 +322,7 @@ and triggers.
 %prep
 
 %build
-%if 0%{?suse_version} >= 1500
+%if %{with sysusers}
 %sysusers_generate_pre %{SOURCE9} %{name}-server %{name}-server.conf
 %endif
 echo "This is a dummy package to provide a dependency on the default PostgreSQL version." > README
@@ -355,7 +363,7 @@ ln -sf /etc/init.d/postgresql %buildroot/usr/sbin/rcpostgresql
 install -D -m 0644 %{SOURCE8} %{buildroot}%{_rpmmacrodir}/macros.%{name}
 
 # sysusers.d
-%if 0%{?suse_version} >= 1500
+%if %{with sysusers}
 install -Dm0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/%{name}-server.conf
 %endif
 
@@ -363,7 +371,7 @@ install -Dm0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/%{name}-server.conf
 %define eflag /run/postgresql-was-enabled
 %define aflag /run/postgresql-was-running
 
-%if 0%{?suse_version} >= 1500
+%if %{with sysusers}
 %pre server -f %{name}-server.pre
 %else
 %pre server
@@ -470,7 +478,7 @@ fi
 %config /etc/init.d/postgresql
 %dir %attr(1775,postgres,postgres) /var/run/postgresql
 %endif
-%if 0%{?suse_version} >= 1500
+%if %{with sysusers}
 %{_sysusersdir}/%{name}-server.conf
 %endif