diff --git a/binutils-aarch64-rng.patch b/binutils-aarch64-rng.patch
index 32b354c..c19b421 100644
--- a/binutils-aarch64-rng.patch
+++ b/binutils-aarch64-rng.patch
@@ -40,3 +40,14 @@ diff -rup binutils.orig/opcodes/aarch64-opc.c binutils-2.35.2/opcodes/aarch64-op
 +0+ <.*>:
 +.*:	d53b2405 	mrs	x5, rndr
 +.*:	d53b2426 	mrs	x6, rndrrs
+--- binutils.orig/gas/config/tc-aarch64.c	2022-05-23 09:44:07.623234684 +0100
++++ binutils-2.35.2/gas/config/tc-aarch64.c	2022-05-23 09:47:09.147696001 +0100
+@@ -9206,7 +9206,7 @@ aarch64_parse_features (const char *str,
+ 	    break;
+ 	  }
+ 
+-      if (opt->name == NULL)
++      if (opt->name == NULL && adding_value)
+ 	{
+ 	  as_bad (_("unknown architectural extension `%s'"), str);
+ 	  return 0;
diff --git a/binutils.spec b/binutils.spec
index 006cec4..cce6eb0 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.35.2
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/binutils
 
@@ -406,8 +406,13 @@ Patch52: binutils-gas-Use-the-directory-name-in-.file-0.patch
 # Lifetime: Who knows.
 Patch53: gcc12-libtool-no-rpath.patch
 
-# Purpose:  Allow the AArch64 RNG extension to be used wihtout ARMv8.5
-# Lifetime: Fixed in 2.39
+# Purpose:  Allow the AArch64 RNG extension to be used wihtout ARMv8.5.
+#       In addition stops the assembler from issuing error messages for
+#       unknown AArch64 architectural extensions that are being disabled.
+#       This can happen when compiling with -mcpu=native on a machine which
+#       does not support all of the extensions known to GCC.
+#       See BZ 2071038 for more details.
+# Lifetime: Permanent.
 Patch54: binutils-aarch64-rng.patch
 
 # Purpose:  Allow 'z16' to be used as an alias for the arch14
@@ -1012,6 +1017,9 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Mon May 23 2022 Nick Clifton  <nickc@redhat.com> - 2.35.2-23
+- GAS: AArch64: Do not complain about unknown disabled architecture extensions.  (#2071038)
+
 * Tue May 03 2022 Nick Clifton  <nickc@redhat.com> - 2.35.2-22
 - Add support for generating s390x static PIE binaries.  (#2080164)