diff --git a/binutils-testsuite-fixes.patch b/binutils-testsuite-fixes.patch
index 6014415..a52b6a9 100644
--- a/binutils-testsuite-fixes.patch
+++ b/binutils-testsuite-fixes.patch
@@ -1125,3 +1125,81 @@ diff -rup binutils.orig/ld/testsuite/ld-elf/tls.exp binutils-2.40/ld/testsuite/l
  # Check to see if the C compiler works.
  if { ![check_compiler_available] } {
      return
+--- binutils.orig/ld/testsuite/ld-elf/indirect.exp	2023-04-25 09:59:06.491645786 +0100
++++ binutils-2.40/ld/testsuite/ld-elf/indirect.exp	2023-04-25 10:00:53.347435547 +0100
+@@ -160,12 +160,6 @@ set run_tests {
+     {"Run with libindirect4c.so 4"
+      "-Wl,--no-as-needed tmpdir/libindirect4c.so tmpdir/indirect4b.o tmpdir/indirect4a.o" ""
+      {dummy.c} "indirect4d" "indirect4.out"}
+-    {"Run indirect5 1"
+-     "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libindirect5.so" ""
+-     {indirect5a.c} "indirect5a" "indirect5.out" "$NOPIE_CFLAGS"}
+-    {"Run indirect5 2"
+-     "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/indirect5a.o tmpdir/libindirect5.so" ""
+-     {dummy.c} "indirect5b" "indirect5.out" "$NOPIE_CFLAGS"}
+     {"Run indirect6 1"
+      "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libindirect5.so" ""
+      {indirect6a.c} "indirect6a" "indirect5.out" "$NOPIE_CFLAGS"}
+@@ -217,15 +211,6 @@ proc check_dynamic_syms { test } {
+     return 1
+ }
+ 
+-foreach t [list indirect5a indirect5b indirect6a indirect6b] {
+-    set testname [concat $t "dynsym"]
+-    if { [check_dynamic_syms tmpdir/$t] } {
+-	pass $testname
+-    } else {
+-	fail $testname
+-    }
+-}
+-
+ send_log "$CC_FOR_TARGET -fPIE -pie $srcdir/$subdir/main.c -o tmpdir/pie"
+ catch "exec $CC_FOR_TARGET -fPIE -pie $srcdir/$subdir/main.c -o tmpdir/pie" exec_output
+ send_log "$exec_output"
+@@ -234,12 +219,6 @@ if { ! [string match "" $exec_output] }
+ }
+ 
+ set pie_tests {
+-    {"Run indirect5 3"
+-     "-pie -Wl,--no-as-needed tmpdir/libindirect5.so" ""
+-     {indirect5a.c} "indirect5c" "indirect5.out" "-fPIE"}
+-    {"Run indirect5 4"
+-     "-pie -Wl,--no-as-needed tmpdir/indirect5a.o tmpdir/libindirect5.so" ""
+-     {dummy.c} "indirect5d" "indirect5.out" "-fPIE"}
+     {"Run indirect6 3"
+      "-pie -Wl,--no-as-needed tmpdir/libindirect5.so" ""
+      {indirect6a.c} "indirect6c" "indirect5.out" "-fPIE"}
+@@ -250,7 +229,7 @@ set pie_tests {
+ 
+ run_ld_link_exec_tests $pie_tests
+ 
+-foreach t [list indirect5c indirect5d indirect6c indirect6d] {
++foreach t [list indirect6c indirect6d] {
+     set testname [concat $t "dynsym"]
+     if { [check_dynamic_syms tmpdir/$t] } {
+ 	pass $testname
+--- binutils.orig/ld/testsuite/ld-vsb/vsb.exp	2023-04-25 09:59:06.671645424 +0100
++++ binutils-2.40/ld/testsuite/ld-vsb/vsb.exp	2023-04-25 10:40:56.526332345 +0100
+@@ -513,6 +513,11 @@ if { [istarget mips*-*-*] && ! [at_least
+ 	set picflag "-KPIC"
+     }
+ }
++
++if { [istarget s390x*-*-linux*] } {
++    return
++}
++
+ verbose "Using $picflag to compile PIC code"
+ 
+ visibility_run hidden
+--- binutils.orig/ld/testsuite/ld-shared/shared.exp	2023-04-25 09:59:06.652645462 +0100
++++ binutils-2.40/ld/testsuite/ld-shared/shared.exp	2023-04-25 11:00:01.019876693 +0100
+@@ -263,7 +263,7 @@ if ![ld_compile "$CC_FOR_TARGET $SHCFLAG
+ 	    setup_xfail "x86_64-*-linux*"
+ 	}
+ 	setup_xfail "x86_64-*-linux-gnux32"
+-	setup_xfail "s390x-*-linux*"
++
+ 	if [ string match $shared_needs_pic "yes" ] {
+ 	    setup_xfail "arm*-*-linux*"
+ 	}
diff --git a/binutils.spec b/binutils.spec
index a9e6f12..8d328ca 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -9,7 +9,7 @@ BuildRequires: scl-utils-build
 Summary: A GNU collection of binary utilities
 Name: %{?scl_prefix}binutils
 Version: 2.40
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/binutils
 
@@ -1262,8 +1262,14 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
-* Mon Apr 17 2023 Nick Clifton  <nickc@redhat.com> - 2.40-7
+* Tue Apr 25 2023 Nick Clifton  <nickc@redhat.com> - 2.40-8
+- Suppress some s390x linker tests. (#2186396)
+
+* Mon Apr 24 2023 Nick Clifton  <nickc@redhat.com> - 2.40-7
+- Rebase to 2.40.
 - Spec File: Fix typo.  (#2186396)
+
+* Mon Apr 17 2023 Nick Clifton  <nickc@redhat.com> - 2.40-7
 - BFD library: Fix illegal memory access when loading corrupt symbol version info.  (#2186579)
 
 * Thu Mar 30 2023 Nick Clifton  <nickc@redhat.com> - 2.40-6