diff --git a/gdb.changes b/gdb.changes
index 6a881c9..7a81d11 100644
--- a/gdb.changes
+++ b/gdb.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 17 10:18:44 UTC 2021 - Tom de Vries <tdevries@suse.com>
+
+- Fix Leap 15.3 s390x gdb:testsuite build, by not requiring
+  glibc-devel-static-32bit.
+
 -------------------------------------------------------------------
 Thu Jun 17 09:36:06 UTC 2021 - Tom de Vries <tdevries@suse.com>
 
diff --git a/gdb.spec b/gdb.spec
index 8aa5e2a..0c88cc3 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -445,6 +445,16 @@ BuildRequires:  babeltrace-devel
 %endif #!s390x
 %endif #!el5
 
+%ifarch s390x
+%if 0%{?sle_version} == 150300 && 0%{?is_opensuse}
+%define leap_15_3_s390x 1
+%else
+%define leap_15_3_s390x 0
+%endif
+%else
+%define leap_15_3_s390x 0
+%endif
+
 BuildRequires:  dejagnu
 BuildRequires:  sharutils
 # gcc-objc++ is not covered by the GDB testsuite.
@@ -466,7 +476,8 @@ BuildRequires:  %{gcc}-ada
 BuildRequires:  %{gcc}-ada-32bit
 %endif
 BuildRequires:  %{gcc}-c++-32bit
-%if 0%{suse_version} >= 1210 && 0%{suse_version} != 1315
+%if 0%{suse_version} >= 1210 && 0%{suse_version} != 1315 && %{leap_15_3_s390x} == 0
+# glibc-devel-static-32bit is (currently?) unavailable for Leap 15.3/s390x.
 BuildRequires:  glibc-devel-static-32bit
 %endif
 %endif