diff --git a/slurm.changes b/slurm.changes
index 1f5c813..ff93452 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jul  7 09:05:40 UTC 2020 - Egbert Eich <eich@suse.com>
+
+- Add support for openPMIx also for Leap/SLE 15.0/1 (bsc#1173805).
+- Do not run %check on SLE-12-SP2: Some incompatibility in tcl
+  makes this fail.
+- Remove unneeded build dependency to postgresql-devel.
+- Disable build on s390 (requires 64bit).
+
 -------------------------------------------------------------------
 Wed Jun  3 11:11:11 UTC 2020 - Egbert Eich <eich@suse.com>
 
diff --git a/slurm.spec b/slurm.spec
index 44b3b9f..5818ebc 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -28,12 +28,13 @@
 
 %define pname slurm
 
-%ifarch i586 %arm
+%ifarch i586 %arm s390
 ExclusiveArch:  do_not_build
 %endif
 
 %if 0%{?sle_version} == 120200
 %define base_ver 1702
+%define nocheck 1
 %endif
 %if 0%{?sle_version} == 150000
 %define base_ver 1711
@@ -49,8 +50,8 @@ ExclusiveArch:  do_not_build
 %define upgrade 1
 %endif
 
-# Build with PMIx only for SLE >= 15.2 and TW
-%if 0%{?sle_version} >= 150200 || 0%{suse_version} >= 1550
+# Build with PMIx only for SLE >= 15.0 and TW
+%if 0%{?sle_version} >= 150000 || 0%{suse_version} >= 1550
 %{bcond_without pmix}
 %else
 %{bcond_with pmix}
@@ -153,7 +154,6 @@ BuildRequires:  ncurses-devel
 %{?with_pmix:BuildRequires:  pmix-devel}
 BuildRequires:  openssl-devel >= 0.9.6
 BuildRequires:  pkgconfig
-BuildRequires:  postgresql-devel >= 8.0.0
 BuildRequires:  readline-devel
 %if 0%{?suse_version} > 1310 || 0%{?sle_version}
  %if 0%{?sle_version} >= 120400 && 0%{?sle_version} < 150000
@@ -724,7 +724,7 @@ rm -f %{buildroot}/%{_mandir}/man8/slurmrestd.*
 %endif
 
 %check
-make check
+%{!?nocheck:make check}
 
 %define fixperm() [ $1 -eq 1 -a -e %2 ] && /bin/chmod %1 %2