diff --git a/macros b/macros
index 81471b0..70b343e 100644
--- a/macros
+++ b/macros
@@ -301,6 +301,9 @@ print(result)
 %_annobin_clang_plugin	%dnl-fplugin=/usr/lib64/clang/`clang -dumpversion`/lib/annobin.so
 %_annotation_cflags     %{?_annotated_build:%{expand:%%{_annobin_%{toolchain}_plugin}}}
 %_annotation_ldflags	%{?_lto_cflags:%{_annotation_cflags}}
+# Use the remove-section option to force the find-debuginfo script
+# to move the annobin notes into the separate debuginfo file.
+%_find_debuginfo_vendor_opts %{?_annotated_build:--remove-section .gnu.build.attributes}
 
 # Fail linking if there are undefined symbols.  Required for proper
 # ELF symbol versioning support.  Disabled by default.
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index d242914..cb21d27 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -6,7 +6,7 @@
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
-Version: 195
+Version: 196
 Release: 1%{?dist}
 # No version specified.
 License: GPL+
@@ -213,6 +213,10 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
 %doc buildflags.md
 
 %changelog
+* Mon Jun 27 2022 Nick Clifton  <nickc@redhat.com> - 196-1
+- Pass "--remove section .gnu.build.attributes" to the find-debuginfo script.
+- Resolves: rhbz#2099613
+
 * Wed Jun 15 2022 Florian Festi <ffesti@redhat.com> - 195-1
 - Detect compressed kernel modules
 - Resolves: rhbz#2008544