diff --git a/binutils-do-not-use-debuginfod.patch b/binutils-do-not-use-debuginfod.patch
index be1f43a..17a06d0 100644
--- a/binutils-do-not-use-debuginfod.patch
+++ b/binutils-do-not-use-debuginfod.patch
@@ -256,3 +256,29 @@ diff -rup binutils.orig/binutils/testsuite/binutils-all/debuginfod.exp binutils-
  } else {
      untested "$test (readelf not configured with debuginfod)"
  }
+--- binutils.ori/binutils/dwarf.c	2022-06-30 14:55:24.390992919 +0100
++++ binutils-2.38/binutils/dwarf.c	2022-06-30 14:58:06.540908399 +0100
+@@ -11764,7 +11764,10 @@ dwarf_select_sections_by_names (const ch
+ 	  if (strncmp (p, entry->option, len) == 0
+ 	      && (p[len] == ',' || p[len] == '\0'))
+ 	    {
+-	      * entry->variable = entry->val;
++	      if (entry->val == 0)
++		* entry->variable = 0;
++	      else
++		* entry->variable |= entry->val;
+ 	      result |= entry->val;
+ 
+ 	      /* The --debug-dump=frames-interp option also
+@@ -11849,7 +11852,10 @@ dwarf_select_sections_by_letters (const
+ 	{
+ 	  if (entry->letter == * letters)
+ 	    {
+-	      * entry->variable |= entry->val;
++	      if (entry->val == 0)
++		* entry->variable = 0;
++	      else
++		* entry->variable |= entry->val;
+ 	      result |= entry->val;
+ 
+ 	      if (! entry->cont)
diff --git a/binutils.spec b/binutils.spec
index db88050..3fab64b 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -39,7 +39,7 @@
 Summary: A GNU collection of binary utilities
 Name: binutils%{?name_cross}%{?_with_debug:-debug}
 Version: 2.38
-Release: 15%{?dist}
+Release: 17%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/binutils
 
@@ -159,7 +159,8 @@ URL: https://sourceware.org/binutils
 # its debug informnation.
 %undefine __brp_strip_static_archive
 
-%define _find_debuginfo_opts --remove-section .gnu.build.attributes
+# Define this to move the annobin profiling data into the separate debuginfo file.
+# %%define _find_debuginfo_opts --remove-section .gnu.build.attributes
 
 #----------------------------------------------------------------------------
 
@@ -939,6 +940,9 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Thu Jun 30 2022 Nick Clifton  <nickc@redhat.com> - 2.38-16
+- Fix a problem honouring readelf's -wE and -wN command line options.
+
 * Mon Jun 13 2022 Nick Clifton  <nickc@redhat.com> - 2.38-15
 - Fix a problem with PowerPC's handling of DT_RELR relocs.  (#2095622)
 - Move annobin data into a separate debuginfo file.